Update 1.7 to build with Qt 5.4:

- Add new QtWebkit dependencies - Remove dependency to merged accessibility module
v1.7.1
2015-02-02 08:56:24 +01:00 · 2014-12-18 12:45:49 +01:00 · 2014-12-18 12:45:12 +01:00
@@ -15,8 +15,8 @@ StrCpy $PageReinstall_SAME_Field_3 "Odinstalovat ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Odinstalovat ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Vyberte možnost údržby k provedení."
 StrCpy $SEC_APPLICATION_DETAILS "Instalují se náležitosti ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Stavové ikony pro Windows Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instaluji stavové ikony pro Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Stavová ikona pro Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instaluji stavovou ikonu pro Windows Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Zástupce v Nabídce Start"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Přidávám zástupce pro ${APPLICATION_NAME} do Nabídky Start."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Zástupce na ploše"
@@ -15,8 +15,6 @@ StrCpy $PageReinstall_SAME_Field_3 "Desinstalli ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalli ${APPLICATION_NAME}"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Vali hooldustegevus, mida sa soovid sooritada."
 StrCpy $SEC_APPLICATION_DETAILS "Paigaldan ${APPLICATION_NAME} põhiosa."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Windows Exploreri staatuse ikoon"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Windows Exploreri staatuse ikooni paigaldamine"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Start Menüü Programmide viit"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Lisan ${APPLICATION_NAME} viida Start menüüsse."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Töölaua otsetee"
@@ -44,3 +42,5 @@ StrCpy $INIT_INSTALLER_RUNNING "Paigaldaja on juba k
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "See desinstallija vajab admini ligipääsu, proovi uuesti"
 StrCpy $INIT_UNINSTALLER_RUNNING "See desinstallija on juba käimas"
 StrCpy $SectionGroup_Shortcuts "Viidad"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status icons for Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons for Windows Explorer"
@@ -1,28 +1,26 @@
 # Auto-generated - do not modify
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Afficher les notes de version"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Le(s) processus en cours d’exécution ${APPLICATION_EXECUTABLE} doit (doivent) être stoppé(s) afin de poursuivre.$\nVoulez-vous que le programme d’installation s’en charge pour vous ?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Fermeture des processus ${APPLICATION_EXECUTABLE}."
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Montrer les notes de version"
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Le(s) processus en cours d’exécution ${APPLICATION_EXECUTABLE} doit être stoppé afin de poursuivre.$\nVoulez-vous que le programme d’installation s’en charge pour vous ?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Fermeture du processus ${APPLICATION_EXECUTABLE}."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Les processus à stopper n'ont pas été trouvés."
-StrCpy $PageReinstall_NEW_Field_1 "Une ancienne version de ${APPLICATION_NAME} est installée sur votre système. Il est recommandé de désinstaller cette version avant de continuer. Sélectionnez l'opération que vous voulez exécuter et cliquez sur Suivant pour continuer."
+StrCpy $PageReinstall_NEW_Field_1 "Une vieille version de ${APPLICATION_NAME} est installée sur votre système. Il est recommandé que vous désinstalliez cette version avant l'installation. Sélectionnez l'opération que vous voulez exécuter et cliquez sur Suivant pour continuer."
 StrCpy $PageReinstall_NEW_Field_2 "Désinstaller avant d'installer à nouveau"
 StrCpy $PageReinstall_NEW_Field_3 "Ne pas désinstaller"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Déjà installée"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Choisissez comment installer ${APPLICATION_NAME}."
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Choisissez comment vous voulez installer ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Une version plus récente de ${APPLICATION_NAME} est déjà installée ! Il n'est pas recommandé d'installer une version plus ancienne. Si vous voulez vraiment installer cette version plus ancienne, il est préférable de d'abord désinstaller la version courante. Sélectionnez l'opération que vous voulez exécuter et cliquez sur Suivant pour continuer."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} est déjà installé.\nSélectionnez l'opération que vous voulez exécuter et cliquez sur Suivant pour continuer."
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} est déjà installée.\nSélectionnez l'opération que vous voulez exécuter et cliquez sur Suivant pour continuer."
 StrCpy $PageReinstall_SAME_Field_2 "Ajouter/Réinstaller des composants"
 StrCpy $PageReinstall_SAME_Field_3 "Désinstaller ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Désinstaller ${APPLICATION_NAME}"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choisir l'opération de maintenance à effectuer."
-StrCpy $SEC_APPLICATION_DETAILS "Installation des essentiels de ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Icônes d'état pour l'Explorateur Windows"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installation des icones d'état pour l'Explorateur Windows"
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Choisir l'option de maintenance à appliquer."
+StrCpy $SEC_APPLICATION_DETAILS "Installer les essentiels de ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Raccourci programme du menu Démarrer"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Ajout d'un raccourci pour ${APPLICATION_NAME} au menu Démarrer."
+StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Ajouter un raccourci pour ${APPLICATION_NAME} au menu Démarrer."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Raccourci Bureau"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Création d'un raccourci sur le Bureau"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Créer un raccourci Bureau"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Raccourci de lancement rapide"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Création d'un raccourci de lancement rapide"
+StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Créer un raccourci de lancement rapide"
 StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "Essentiels de ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Raccourci de ${APPLICATION_NAME}"
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Raccourci Bureau de ${APPLICATION_NAME}."
@@ -34,13 +32,15 @@ StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Oui, supprimer ce dossier de données."
 StrCpy $UNINSTALLER_FILE_Detail "Écriture du désinstallateur"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Écriture des clefs de registre du désinstallateur"
 StrCpy $UNINSTALLER_FINISHED_Detail "Terminé"
-StrCpy $UNINSTALL_MESSAGEBOX "Il semble que ${APPLICATION_NAME} ne soit pas installé dans le dossier '$INSTDIR'.$\n$\nVoulez-vous poursuivre (non recommandé) ?"
+StrCpy $UNINSTALL_MESSAGEBOX "Il semble que ${APPLICATION_NAME} ne soit pas installée dans le dossier '$INSTDIR'.$\n$\nVoulez-vous poursuivre (non recommandé) ?"
 StrCpy $UNINSTALL_ABORT "Désinstallation interrompue par l'utilisateur"
-StrCpy $INIT_NO_QUICK_LAUNCH "Raccourci de lancement rapide (non disponible)"
+StrCpy $INIT_NO_QUICK_LAUNCH "Raccourci de lancement rapide (N/A)"
 StrCpy $INIT_NO_DESKTOP "Raccourci bureau (remplace l’existant)"
-StrCpy $UAC_ERROR_ELEVATE "Échec d'élévation, erreur :"
+StrCpy $UAC_ERROR_ELEVATE "Echec d'élévation, erreur :"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Cet installateur requiert les droits administrateur, essayez à nouveau"
 StrCpy $INIT_INSTALLER_RUNNING "Une installation est déjà en cours."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Ce désinstallateur requiert les droits administrateur, essayez à nouveau"
 StrCpy $INIT_UNINSTALLER_RUNNING "Une désinstallation est déjà en cours."
 StrCpy $SectionGroup_Shortcuts "Raccourcis"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status icons for Windows Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installing status icons for Windows Explorer"
@@ -15,8 +15,8 @@ StrCpy $PageReinstall_SAME_Field_3 "${APPLICATION_NAME} entfernen"
 StrCpy $UNINSTALLER_APPDATA_TITLE "${APPLICATION_NAME} entfernen"
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Wählen Sie zur Ausführung die Wartungsoption."
 StrCpy $SEC_APPLICATION_DETAILS "Installiere ${APPLICATION_NAME} Basis."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Statussymbole für den Windows-Explorer"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Statussymbole für den Windows-Explorer werden installiert"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Status-Icons für den Windows-Explorer"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installiere Status-Icons für den Windows-Explorer"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Installiere Verknüpfung im Programmmenü"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Füge Verknüpfung für ${APPLICATION_NAME} dem Startmenü hinzu."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Desktop-Verknüpfung"
@@ -38,7 +38,7 @@ StrCpy $UNINSTALL_MESSAGEBOX "Es scheint, als ob ${APPLICATION_NAME} nicht im Ve
 StrCpy $UNINSTALL_ABORT "Deinstallation vom Benutzer abgebrochen"
 StrCpy $INIT_NO_QUICK_LAUNCH "Schnellstart-Verknüpfung (Nicht verfügbar)"
 StrCpy $INIT_NO_DESKTOP "Desktop-Verknüpfung (überschreibt vorhandene)"
-StrCpy $UAC_ERROR_ELEVATE "Rechte können nicht erhöht werden, Fehler:"
+StrCpy $UAC_ERROR_ELEVATE "Kann Rechte nicht erhöhen, Fehler:"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Dieses Installationsprogramm erfordert Administrator-Rechte, bitte erneut versuchen"
 StrCpy $INIT_INSTALLER_RUNNING "Das Installationsprogramm wird bereits ausgeführt."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Das Deinstallationsprogramm erfordert Administrator-Rechte. Bitte erneut versuchen."
@@ -16,7 +16,7 @@ StrCpy $UNINSTALLER_APPDATA_TITLE "
 StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Επιλέξτε την επιλογή συντήρησης που θα πραγματοποιηθεί."
 StrCpy $SEC_APPLICATION_DETAILS "Εγκατάσταση βάσης ${APPLICATION_NAME} σε εξέλιξη."
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Εικονίδια κατάστασης για την Εξερεύνηση των Windows"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Εγκατάσταση εικονιδίων κατάστασης για την Εξερεύνηση των Windows"
+StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Εγκατάσταση εικονιδίων κατάστασης στην Εξερεύνηση των Windows"
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Συντόμευση στο Αρχικό Μενού"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Προσθήκη συντόμευσης για την ${APPLICATION_NAME} στο Αρχικό Μενού."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Συντόμευση επιφάνειας εργασίας"
@@ -1,19 +1,19 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar notas de lançamento"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Processos(s) ${APPLICATION_EXECUTABLE} em execução. Estes processos precisam de ser interrompidos.$\\nDeseja que o instalador os termine automaticamente?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "A terminar os processos ${APPLICATION_EXECUTABLE}."
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Não foi encontrado o processo a terminar!"
-StrCpy $PageReinstall_NEW_Field_1 "Uma versão antiga de ${APPLICATION_NAME} está instalada no sistema. É recomendado que você desinstale a versão atual antes de instalar. Selecione a operação que deseja executar e clique em $\"Avançar$\" para continuar."
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Encontrados processos ${APPLICATION_EXECUTABLE} que precisam de ser parados.$\nDeseja que o instalador os pare ?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "A terminar processos ${APPLICATION_EXECUTABLE}."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Processo para terminar não foi encontrado!"
+StrCpy $PageReinstall_NEW_Field_1 "Está instalada uma versão anterior de ${APPLICATION_NAME} no seu sistema. Recomenda-se que desinstale primeiro a versão atual antes de instalar. Selecione a operação que pretende fazer, e clique Seguinte para continuar."
 StrCpy $PageReinstall_NEW_Field_2 "Desinstalar antes de instalar"
-StrCpy $PageReinstall_NEW_Field_3 "Não desinstale"
+StrCpy $PageReinstall_NEW_Field_3 "Não desinstalar"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Já instalado"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Escolha como pretende instalar ${APPLICATION_NAME}."
-StrCpy $PageReinstall_OLD_Field_1 "Uma versão mais recente do ${APPLICATION_NAME}  já está instalada! Não é recomendada a instalação de uma versão mais antiga. Se realmente deseja instalar esta versão, aconselha-se a desinstalação da versão atual primeiro. Selecione a operação que deseja executar e clique em Avançar para continuar."
+StrCpy $PageReinstall_OLD_Field_1 "Já esta instalada uma nova versão dfe ${APPLICATION_NAME}! Não se recomenda instalar uma versão anterior. Se quer mesmo instalar esta versão mais antiga, é melhor desinstalar primeiro a versão atual. Selecione a operação que pretende fazer e clique Seguinte para continuar."
 StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} já está instalado.\nSelecione a operação que deseja fazer, e clique Seguinte para continuar."
 StrCpy $PageReinstall_SAME_Field_2 "Adicionar/Reinstalar Componentes"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalar ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalar ${APPLICATION_NAME}"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Escolha a opção de manutenção a realizar."
+StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Escolha a opção de manutenção a fazer."
 StrCpy $SEC_APPLICATION_DETAILS "A instalar o essencial de ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Icons de estado para Windows Explorer"
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "A instalar icons de estado para Windows Explorer"
@@ -40,7 +40,7 @@ StrCpy $INIT_NO_QUICK_LAUNCH "Atalho de Início Rápido (N/A)"
 StrCpy $INIT_NO_DESKTOP "Atalho do Ambiente de Trabalho (sobrepõe o existente)"
 StrCpy $UAC_ERROR_ELEVATE "Incapaz de elevar, erro:"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Este instalador precisa de permissões de administrador, tente novamente"
-StrCpy $INIT_INSTALLER_RUNNING "O instalador já está em execução."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Este desinstalador requer permissões de administrador, tente novamente"
-StrCpy $INIT_UNINSTALLER_RUNNING "O desinstalador já está em execução."
+StrCpy $INIT_INSTALLER_RUNNING "O instalador já está a correr."
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Este desinstalador precisa de acesso de administrador; tente novamente"
+StrCpy $INIT_UNINSTALLER_RUNNING "O desinstalador já está a correr."
 StrCpy $SectionGroup_Shortcuts "Atalhos"
@@ -27,14 +27,14 @@ StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "Зависимости прилож
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Ярлык приложения ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Ярлык на рабочем столе для ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Ярлык в меню быстрого запуска для ${APPLICATION_NAME}."
-StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Удалить каталог данных ${APPLICATION_NAME} с вашего компьютера."
-StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Вы хотите удалить каталог с данными ${APPLICATION_NAME} ?"
-StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Оставьте неактивным, для сохранения каталога с данными приложения, для последующего их использования."
-StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Да, удалить этот каталог с данными."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Удалить папку данных ${APPLICATION_NAME} с вашего компьютера."
+StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Вы хотите удалить папку с данными ${APPLICATION_NAME} ?"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Оставьте неактивным, для сохранения папки с данными приложения, для последующего их использования."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Да, удалить эту папку с данными."
 StrCpy $UNINSTALLER_FILE_Detail "Сохранение деинсталятора"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Запись ключей реестра"
 StrCpy $UNINSTALLER_FINISHED_Detail "Завершено"
-StrCpy $UNINSTALL_MESSAGEBOX "Скорее всего, приложение ${APPLICATION_NAME} уже установлено в каталог '$INSTDIR'.\nВсе равно продолжить (не рекомендуется)?"
+StrCpy $UNINSTALL_MESSAGEBOX "Скорее всего, приложение ${APPLICATION_NAME} уже установлено в директорию '$INSTDIR'.\nВсе равно продолжить (не рекомендуется)?"
 StrCpy $UNINSTALL_ABORT "Удаление отменено пользователем"
 StrCpy $INIT_NO_QUICK_LAUNCH "Ярлык быстрого запуска (недоступен)"
 StrCpy $INIT_NO_DESKTOP "Ярлык на рабочем столе (перезаписать существующий)"
@@ -2,12 +2,12 @@
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar las notas de la versión"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "El/los proceso/s ${APPLICATION_EXECUTABLE} debe/n ser detenidos.$\n¿Quiere que el instalador lo haga por usted?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Deteniendo el/los proceso/s ${APPLICATION_EXECUTABLE}."
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "¡Proceso para detener no encontrado!"
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "¡Proceso a detener no encontrado!"
 StrCpy $PageReinstall_NEW_Field_1 "Una versión anterior de ${APPLICATION_NAME} se encuentra instalada en el sistema. Se recomienda de instalar la versión actual antes de instalar la nueva. Seleccione la operacion deseada y haga click en Siguiente para continuar."
 StrCpy $PageReinstall_NEW_Field_2 "Desinstalar antes de instalar"
 StrCpy $PageReinstall_NEW_Field_3 "No desinstalar"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Ya está instalado"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Elija cómo quiere instalar ${APPLICATION_NAME}."
+StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Elija como quiere instalar ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Una nueva versión de ${APPLICATION_NAME} ya está instalada. No es recomendable instalar una versión anterior. Si realmente quiere instalar esta versión anterior, es mejor que desinstale la versión actual primero. Seleccione la operación que desea realizar y pulse Next para continuar."
 StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} ya está instalada.\nSeleccione la operación que desea realizar y pulse Next para continuar."
 StrCpy $PageReinstall_SAME_Field_2 "Añadir/Reinstalar componentes"
@@ -17,7 +17,7 @@ StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Elija la opcion de mantenim
 StrCpy $SEC_APPLICATION_DETAILS "Instalando  ${APPLICATION_NAME} esenciales."
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Íconos de estado para el Explorador de Windows"
 StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Instalando íconos de estado para el Explorador de Windows"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Acceso directo al programa Menú de Inicio"
+StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Acceso Directo al Programa Menú de Inicio"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Añadiendo accesos directos para ${APPLICATION_NAME} en el Menú de Inicio."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Acceso directo de Escritorio"
 StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Creando Accesos Directos de Escritorio"
@@ -27,20 +27,20 @@ StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} esencial."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Acceso Directo de ${APPLICATION_NAME}"
 StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Acceso Directo de Escritorio para ${APPLICATION_NAME}"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Lanzador Rápido de Accesos Director para ${APPLICATION_NAME}."
-StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Elimine la carpeta de datos de ${APPLICATION_NAME} del computador."
+StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Remueva la carpeta de datos de ${APPLICATION_NAME} del computador."
 StrCpy $UNINSTALLER_APPDATA_LABEL_1 "¿Desea eliminar la carpeta de datos de ${APPLICATION_NAME}?"
-StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Déjelo sin marcar para mantener la carpeta de datos para uso posterior o márquelo para eliminar la carpeta de datos."
-StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Sí, elimine esta carpeta de datos."
-StrCpy $UNINSTALLER_FILE_Detail "Escribiendo desinstalador"
-StrCpy $UNINSTALLER_REGISTRY_Detail "Escribiendo claves en el registro del instalador"
+StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Deja sin marcar para mantener la carpeta de datos para uso posterior, o del marque para eliminar la carpeta de datos."
+StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Si, Elimine esta carpeta de datos."
+StrCpy $UNINSTALLER_FILE_Detail "Escribiendo Desinstalador"
+StrCpy $UNINSTALLER_REGISTRY_Detail "Escribiendo Llaves en el Registro del Instalador"
 StrCpy $UNINSTALLER_FINISHED_Detail "Terminado"
 StrCpy $UNINSTALL_MESSAGEBOX "Parece que ${APPLICATION_NAME} no está instalado en el directorio '$INSTDIR'.$$ ¿Continuar de todos modos? (No Recomendado)"
 StrCpy $UNINSTALL_ABORT "Desinstalación cancelada por el usuario"
 StrCpy $INIT_NO_QUICK_LAUNCH "Acceso Directo al Lanzador Rápido (N/A)"
 StrCpy $INIT_NO_DESKTOP "Atajo de escritorio (sobreescribe el existente)"
-StrCpy $UAC_ERROR_ELEVATE "No se ha podido elevar, error:"
+StrCpy $UAC_ERROR_ELEVATE "No se ha podido elevar, Error:"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "El instalador requiere acceso administrativo, intente de nuevo"
 StrCpy $INIT_INSTALLER_RUNNING "El instalador ya se encuentra en ejecución"
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "El desinstalador requiere acceso administrativo, intente de nuevo"
 StrCpy $INIT_UNINSTALLER_RUNNING "El desinstalador ya se encuentra en ejecución."
-StrCpy $SectionGroup_Shortcuts "Accesos directos"
+StrCpy $SectionGroup_Shortcuts "Accesos Directos"
@@ -41,6 +41,6 @@ StrCpy $INIT_NO_DESKTOP "Skrivbordsgenväg (skriver över nuvarande)"
 StrCpy $UAC_ERROR_ELEVATE "Kunde inte få förhöjda rättigheter, fel:"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Detta installationsprogram kräver adminstratörs rättigheter, försök igen"
 StrCpy $INIT_INSTALLER_RUNNING "Installationsprogrammet körs redan."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Detta avinstallationsprogram  kräver administratörsrättigheter, försök igen"
+StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Detta avinstallationsprogram  kräver administratörs rättigheter, försök igen"
 StrCpy $INIT_UNINSTALLER_RUNNING "Avinstallationsprogrammet körs redan."
 StrCpy $SectionGroup_Shortcuts "Genvägar"
@@ -1,46 +0,0 @@
-# Auto-generated - do not modify
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Показати примітки до випуску"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Знайдено процес(и) ${APPLICATION_EXECUTABLE}, які необхідно зупинити.$\nХочете щоб програма установки зробила це самостійно?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Завершення процесів ${APPLICATION_EXECUTABLE}."
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Не знайдено процеси, які необхідно зупинити!"
-StrCpy $PageReinstall_NEW_Field_1 "Знайдено застарілу версію програми ${APPLICATION_NAME}. Рекомендуємо її спочатку видалити. Оберіть подальшу дію та натисніть $\"Далі$\"."
-StrCpy $PageReinstall_NEW_Field_2 "Видалити перед установкою"
-StrCpy $PageReinstall_NEW_Field_3 "Не видаляти"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Установлено"
-StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Оберіть, як ви хочете установити ${APPLICATION_NAME}."
-StrCpy $PageReinstall_OLD_Field_1 "Знайдено новішу версію ${APPLICATION_NAME}! Ми не рекомендуємо встановлювати стару версію. Якщо ви все ж бажаєте встановити цю версію, спочатку видаліть поточну версію. Оберіть подальшу дію та натисніть $\"Далі$\"."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} вже встановлено.↩\nОберіть подальшу дію та натисніть $\"Далі$\"."
-StrCpy $PageReinstall_SAME_Field_2 "Додати/Перевстановити компоненти"
-StrCpy $PageReinstall_SAME_Field_3 "Видалити ${APPLICATION_NAME}"
-StrCpy $UNINSTALLER_APPDATA_TITLE "Видалити ${APPLICATION_NAME}"
-StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Оберіть опцію обслуговування для виконання."
-StrCpy $SEC_APPLICATION_DETAILS "Установка залежностей ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Значки стану для провідника Windows"
-StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Установка значків стану для провідника Windows"
-StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Ярлик в меню Пуск"
-StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Створення ярлика ${APPLICATION_NAME} в меню Пуск."
-StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Ярлик на Робочому столі"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Створення ярлика на Робочому столі"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Ярлик на панелі швидкого запуску"
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Створення ярлика на панелі швидкого запуску"
-StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} залежності."
-StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME} ярлик."
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Ярлик ${APPLICATION_NAME} на Робочому столі."
-StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Ярлик ${APPLICATION_NAME} на панелі швидкого запуску."
-StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Видалити теку даних ${APPLICATION_NAME} з вашого комп'ютера."
-StrCpy $UNINSTALLER_APPDATA_LABEL_1 "Ви дійсно бажаєте видалити теку даних ${APPLICATION_NAME}?"
-StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Залиште неактивним, для збереження теки з даними програми, для подальшого використання."
-StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Так, видалити теку даних."
-StrCpy $UNINSTALLER_FILE_Detail "Збереження Програми видалення"
-StrCpy $UNINSTALLER_REGISTRY_Detail "Запис ключів реєстру"
-StrCpy $UNINSTALLER_FINISHED_Detail "Завершено"
-StrCpy $UNINSTALL_MESSAGEBOX "Скоріш за все ${APPLICATION_NAME} вже встановлено в теку '$INSTDIR'.$↩$\nВсе одно продовжити (не рекомендується)?"
-StrCpy $UNINSTALL_ABORT "Видалення перервано користувачем."
-StrCpy $INIT_NO_QUICK_LAUNCH "Ярлик в області швидкого запуску (недоступний)"
-StrCpy $INIT_NO_DESKTOP "Ярлик на Робочому столі (перезаписати існуючий)"
-StrCpy $UAC_ERROR_ELEVATE "Неможливо підняти, помилка:"
-StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Для установки потрібні права адміністратора, спробуйте ще раз"
-StrCpy $INIT_INSTALLER_RUNNING "Установка вже запущена."
-StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Для видалення потрібні права адміністратора, спробуйте ще раз"
-StrCpy $INIT_UNINSTALLER_RUNNING "Програма видалення вже запущено."
-StrCpy $SectionGroup_Shortcuts "Ярлики"
@@ -6,7 +6,6 @@
 !insertmacro MUI_LANGUAGE "SpanishInternational"
 !insertmacro MUI_LANGUAGE "Dutch"
 !insertmacro MUI_LANGUAGE "Hungarian"
-!insertmacro MUI_LANGUAGE "Ukrainian"
 !insertmacro MUI_LANGUAGE "French"
 !insertmacro MUI_LANGUAGE "Catalan"
 !insertmacro MUI_LANGUAGE "Russian"
@@ -1,33 +1,34 @@
 Setting up an Account
 =====================

-When you run the ownCloud Desktop Sync client the first time, it automatically 
-opens the account setup wizard. Just follow these steps:
+If no account has been configured, the ownCloud Client automatically assist in
+connecting to your ownCloud server after the application has been started.

-1. Enter the URL to your Server. This is the same address used by your Web 
-browser, for example ``https://example.com/owncloud``
+To set up an account:
+
+1. Specify the URL to your Server. This is the same address that is used in the browser.

 .. image:: images/wizard_url.png
   :scale: 50 %

-.. note:: Always use ``https://`` if SSL encryption is enabled on your server. 
-   Otherwise, your password and all traffic between your computer and the 
-   ownCloud server will be transmitted in the clear and wide open for 
-   eavesdroppers.
+.. 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!

-2. Enter your username and password.  These are the same credentials used to 
-   log into the ownCloud Web interface.
+2. Enter the username and password.  These are the same credentials used to log into the web interface.

 .. image:: images/wizard_user.png
   :scale: 50 %

-3. Choose the local folder you want to store your ownCloud files in. By 
-   default, this is a folder called ``ownCloud`` in your home directory.
+3. Choose the folder with which you want the ownCloud Client to synchronize the
+   contents of your ownCloud account. By default, this is a folder called
+   `ownCloud`. This folder is created in the home directory.

 .. image:: images/wizard_targetfolder.png
   :scale: 50 %

-4. The synchronization automatically begins.
+   The synchronization between the root directories of the ownCloud server begins.

 .. image:: images/wizard_overview.png
   :scale: 50 %
@@ -39,6 +40,3 @@ When selecting a local folder that already contains data, you can choose from tw

 * :guilabel:`Start a clean sync`: When selected, all files in the local folder on the
  client are deleted.  These files are not syncrhonized to the ownCloud server.
-
-See :doc:`navigating` to learn how to choose specific folders to sync with on 
-your ownCloud server.
@@ -1,4 +1,3 @@
-==============
 Advanced Usage
 ==============

@@ -25,17 +25,16 @@ result, the ownCloud Client runs on Linux, Windows, and MacOS.
 The Synchronization Process
 ---------------------------

-The process of synchronization keeps files in two separate repositories the 
-same. When synchronized:
+The process of synchronization keeps files in two separate repositories the same. When syncrhonized:

 - If a file is added to one repository it is copied to the other synchronized repository.
- When a file is changed in one repository, the change is propagated to any other
-  synchronized repository.
- If a file is deleted in one repository, it is deleted in any other.
+- When a file is changed in one repository, the change is propagated to any
+  syncrhonized other repositories- If a file is deleted in one repository, it
+  is deleted in any other.

 It is important to note that the ownCloud synchronization process does not use
 a typical client/server system where the server is always master.  This is a
-major difference between the ownCloud synchronization process and other systems
+major difference between the ownCloud syncrhonizatin process and other systems
 like a file backup, where only changes to files or folders and the addition of
 new files are propagated, but these files and folders are never deleted unless
 explicitly deleted in the backup.
@@ -65,7 +64,7 @@ To compare the modification times of two files from different systems, csync
 must operate on the same base. Before ownCloud Client version 1.1.0, csync
 required both device repositories to run on the exact same time.  This
 requirement was achieved through the use of enterprise standard `NTP time
-synchronization`_ on all machines.
+synchronisation`_ on all machines.

 Because this timing strategy is rather fragile without the use of NTP, ownCloud
 4.5 introduced a unique number (for each file?) that changes whenever the file
@@ -124,9 +123,8 @@ traverses the file tree and compares the modification time of each file with an
 expected value stored in its database. If the value is not the same, the client
 determines that the file has been modified in the local repository.

-.. note:: On the local side, the modification time a good attribute to use for 
-   detecting changes, because
-   the value does not depend on time shifts and such.
+.. note:: On the local side, the modificaton time a good attribute to use for detecting changes, because
+the value does not depend on time shifts and such.

 For the remote (that is, ownCloud server) repository, the client compares the
 ETag of each file with its expected value. Again, the expected ETag value is
@@ -9,10 +9,6 @@ users only need to use their normal package managers. However, on Linux systems
 the Updater will check for updates and notify you when a new version is 
 available.

-.. note:: Because of various technical issues, desktop sync clients older than 
-   1.7 will not be allowed to connect and sync with the ownCloud 8.1 server. It is 
-   highly recommended to keep your client updated.
-
 Basic Workflow
 --------------

@@ -44,9 +40,10 @@ Linux
 ^^^^^

 Linux distributions provide their own update tools, so ownCloud clients that use
-the Linux operating system do not perform any updates on their own. The client 
-will inform you (``Settings -> General -> Updates``) when an update is 
-available.
+the Linux operating system do not perform any updates on their own. Linux
+operating systems do, however, check for the latest version of the ownCloud
+client and passively notify the user (``Settings -> General -> Updates``) when
+an update is available.


 Preventing Automatic Updates
@@ -67,7 +64,7 @@ update check mechanism whereas the second method prevents any manual overrides.

 To prevent automatic updates, but allow manual overrides:

-1. Edit these Registry keys:
+1. Migrate to the following directory:

    a. (32-bit) ``HKEY_LOCAL_MACHINE\Software\ownCloud\ownCloud``
    b. (64-bit) ``HKEY_LOCAL_MACHINE\Software\Wow6432Node\ownCloud\ownCloud``
@@ -95,10 +92,10 @@ To prevent automatic updates and disallow manual overrides:
 Preventing Automatic Updates in Mac OS X Environments
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

-You can disable the automatic update mechanism in Mac OS X operating systems
+You can disable the automatic update mechanism in MAC OS X operating systems
 using the system-wide ``.plist`` file.  To access this file:

-1. Go to this directory::
+1. Using the Windows explorer, migrate to the following location::

 	/Library/Preferences/

@@ -16,12 +16,11 @@ Linux
 -----

 1. Add the `ownCloud repository from OBS`_.
-2. Install the dependencies (as root, or using ``sudo``) using the following 
-   commands for your specific Linux distribution:
-  
-   * Debian/Ubuntu: ``apt-get update; apt-get build-dep owncloud-client``
-   * openSUSE: ``zypper ref; zypper si -d owncloud-client``
-   * Fedora/CentOS: ``yum install yum-utils; yum-builddep owncloud-client``
+2. Install the dependencies (as root, or using ``sudo``) using the following commands for your specific Linux distribution:
+
+  * Debian/Ubuntu: ``apt-get update; apt-get build-dep owncloud-client``
+  * openSUSE: ``zypper ref; zypper si -d owncloud-client``
+  * Fedora/CentOS: ``yum install yum-utils; yum-builddep owncloud-client``

 3. Follow the `generic build instructions`_.

@@ -34,7 +33,7 @@ Mac OS X
 --------

 In additon to needing XCode (along with the command line tools), developing in
-the Mac OS X environment requires extra dependencies.  You can install these
+the MAC OS X environment requires extra dependencies.  You can install these
 dependencies through MacPorts_ or Homebrew_.  These dependencies are required
 only on the build machine, because non-standard libs are deployed in the app
 bundle.
@@ -139,26 +138,26 @@ To cross-compile:
 Generic Build Instructions
 --------------------------

-Compared to previous versions, building the desktop sync client has become 
-easier. Unlike earlier versions, CSync, which is the sync engine library of the 
-client, is now part of the client source repository and not a separate module.
+Compared to previous versions, building Mirall has become easier. Unlike
+earlier versions, CSync, which is the sync engine library of Mirall, is now
+part of the Mirall source repository and not a separate module.

-You can download the client from the ownCloud `Client Download Page`_.
+You can download Mirall from the ownCloud `Client Download Page`_.

 To build the most up to date version of the client:

-1. Clone the latest versions of the client from Git_ as follows:
+1. Clone the latest versions of Mirall from Git_ as follows:

-  ``git clone git://github.com/owncloud/client.git``
+  ``git clone git://github.com/owncloud/mirall.git``

 2. Create build directories:

-  ``mkdir client-build``
+  ``mkdir mirall-build``

-3. Build the client:
+3. Build mirall:

-  ``cd ../client-build``
-  ``cmake -DCMAKE_BUILD_TYPE="Debug" ../client``
+  ``cd ../mirall-build``
+  ``cmake -DCMAKE_BUILD_TYPE="Debug" ../mirall``

  ..note:: You must use absolute paths for the ``include`` and ``library``
           directories.
@@ -1,7 +1,7 @@
 .. _contents:

-ownCloud Desktop Client Manual
-==============================
+Contents
+========

 .. toctree::
   :maxdepth: 3
@@ -1,11 +1,11 @@
-Installing the Desktop Synchronization Client
-=============================================
+Installing the Synchronization Client
+=====================================

-The latest version of the ownCloud Desktop Synchronization Client can be 
-obtained from the `ownCloud Website <http://www.owncloud.com>`_. You can 
-download and install the client on Windows, Mac OS X, and various Linux software 
-distrubutions. The following sections describe specific support and installation 
-procedures for the different software platforms:
+The latest version of the ownCloud Synchronization Client can be obtained from
+the `ownCloud Website <http://www.owncloud.com>`_. You can download and install
+the client on Windows, MAC OSX, and various Linux software distrubutions. The
+following sections describe specific support and installation procedures for
+the different software platforms:

 - :ref:`installing-windows`
 - :ref:`installing-macosx`
@@ -1,16 +1,14 @@
 Introduction
 ============

-Available for Windows, Mac OS X, and various Linux distributions, the ownCloud 
-Desktop Sync client enables you to:
+Available for Windows, MAC OS X, and various Linux distributions, the ownCloud
+Sync client is a desktop program installed on your computer. The client enables
+you to:

 - Specify one or more directories on your computer that you want to synchronize
  to the ownCloud server.
 - Always have the latest files synchronized, wherever they are located.

-Your files are always automatically synchronized between your ownCloud server 
-and local PC.
+Changes made to any synchronized file on the computer are automatically made to
+the files on the ownCloud server using the sync client.

-.. note:: Because of various technical issues, desktop sync clients older than 
-   1.7 will not be allowed to connect and sync with the ownCloud 8.1 server. It is 
-   highly recommended to keep your client updated.
@@ -3,15 +3,16 @@ Using the Synchronization Client

 .. index:: navigating, usage

-The ownCloud Desktop Client remains in the background and is visible as an icon 
-in the system tray (Windows, KDE), status bar (Mac OS X), or notification area 
+The ownCloud Client remains in the background and is visible as an icon in the
+system tray (Windows, KDE), status bar (MAC OS X), or notification area
 (Linux).

 .. image:: images/icon.png

-The status indicator uses overlay icons to indicate the current status of your 
-synchronization. The green circle with the white checkmark tells you that your 
-synchronization is current and you are connected to your ownCloud server.
+This is a status indicator which uses overlay icons to indicate the 
+current status of your synchronization. The green circle with the white checkmark 
+tells you that your synchronization is current and you are connected to your 
+ownCloud server.

 .. image:: images/icon-syncing.png

@@ -41,7 +42,7 @@ incorrect login or server URL.
 Using the Desktop Client Menu
 -----------------------------

-A right-click on the icon opens the
+A left-click on the icon (right-click on Windows) opens the
 following menu:

 .. image:: images/menu.png
@@ -50,13 +51,13 @@ following menu:

 The Desktop Client menu provides the following options:

-* ``Open ownCloud in browser``: Launches the ownCloud Web interface.
-* ``Open folder 'ownCloud'``: Opens your local ownCloud folder. If you have 
-    defined multiple synchronization targets, the window displays each local 
-    folder.
+* ``Open ownCloud in browser``: Launches the ownCloud WEB interface.
+* ``Open folder 'ownCloud'``: Opens the ownCloud local folder. If you have 
+  defined multiple synchronization targets, the window displays each local 
+  folder.
 * **Disk space indicator**: Indicates the amount of space currently used on the 
  server.
-* **Operation indicator**: Displays the status of the current synchronization 
+* Operation indicator: Displays the status of the current synchronization 
  process or indicates ``Up to date`` if the server and client are in sync.
 * **Recent Changes**: Displays the last six files modified, and shows the 
  current synchronization status listing all changes since the last restart of the 
@@ -72,9 +73,9 @@ Using the Account Settings Window

 .. index:: account settings, user, password, Server URL

-The ``Account`` window provides a summary for your ownCloud account settings.  
-You can manage which folders and files you want to synchronize, change your 
-account settings, and pause and resume synchronization.
+The ``Account`` window provides a summary for general settings associated with 
+the ownCloud account.  This window enables you to manage any synchronized 
+folders in the account, and to modify which folders you want to sync.

 To access and modify the account settings:

@@ -96,19 +97,21 @@ The fields and options in this window include:
  button is used when you want to synchronize only a few folders and not the 
  root folder. 

-* ``Storage Usage`` field: Displays how much space your files are using on the 
-   ownCloud server.
+* ``Storage Usage`` field: Indicates the storage utilization on the ownCloud 
+  server.

 * ``Edit Ignored Files`` button: Launches the Ignored Files Editor.

-* ``Modify Account`` button: Use this to change your ownCloud server settings 
-  by launching the account setup wizard (see :doc:`accountsetup`).
+* ``Modify Account`` button: Use this to change the ownCloud server to which 
+  you are synchronizing. This option launches the ``Setting up an Account`` 
+  dialog (see :doc:`accountsetup`).
+

 Adding a Folder
 ^^^^^^^^^^^^^^^

-The ``Add Folder ...`` button enables you to add a new local folder to the 
-synchronization process.
+The ``Add a Folder ...`` button enables you to add a new folder to the 
+syncrhonization process.

 To add a new folder:

@@ -118,10 +121,11 @@ To add a new folder:

 .. image:: images/folderwizard_local.png

-2. Type a *unique* path and alias name to the folder, or use the ``Choose...`` 
-   button to open a graphical file picker.
+2. Specify a *unique* path and alias name to the folder or use the ``Choose...`` 
+   button to locate the new folder on your system to which you want to 
+   synchronize.

-.. note:: Nested synchronizations are not supported.  You
+.. note:: Nested synchronizations are not supported.  In other words, you
    cannot add a folder that is already contained within another synchronized
    folder. In addition, you cannot add a higher level (parent) folder that
    contains a folder to which you are already synchronizing.  By default, the
@@ -132,12 +136,12 @@ To add a new folder:
 3. Click 'Next' to continue.

  A window opens prompting you to select a remote destination folder on the
-  ownCloud server to synchronize.
+  ownCloud server to which you want to synchronize.

 .. image:: images/folderwizard_remote.png

 4. Select a folder on the ownCloud server to which you want to synchronize your 
-   newly added local folder.
+newly added folder.

 .. note:: A server folder can only be synchronized with a particular client 
  once. If you attempt to sync the root directory, you cannot sync with 
@@ -148,13 +152,13 @@ To add a new folder:
 Editing Ignored Files
 ^^^^^^^^^^^^^^^^^^^^^

-The :guilabel:`Ignored Files Editor` provides a list of  files that are ignored 
-(that is, not synchronized) by the client and server during synchronizations. 
-You may add additional files or directories that you want to exclude from the 
-synchronization process. In addition to using standard characters, the Ignored 
-Files Editor enables you to use wild cards (for example, using an asterisk ‘*’ 
-to indicate multiple characters or a question mark ‘?’ to incidate a single 
-character).
+The :guilabel:`Ignored Files Editor` provides a list of preconfigured files that are 
+ignored (that is, not synchronized) by the client and server during synchronizations. You 
+may add additional files or directories that you want to exclude from the synchronization 
+process. In addition to using standard characters, the Ignored Files Editor enables you 
+to 
+use wild cards (for example, using an asterisk ‘*’ to indicate multiple characters or a 
+question mark ‘?’ to incidate a single character).

 For additional information see `Using the Ignored Files 
 Editor`_
@@ -184,8 +188,9 @@ Using the General Settings Window

 .. index:: general settings, auto start, startup, desktop notifications

-The General settings window has options for launching the client at system 
-startup, notifications, and using monochrome icons.
+The General settings window enables you to set general settings for the
+ownCloud Desktop Client, provides information about the software version,
+its creator, and the existence of any updates.

 .. image:: images/settings_general.png

@@ -200,7 +205,7 @@ startup, notifications, and using monochrome icons.
 * ``Use Monochrome Icons`` checkbox: Provides the option to check (enable) or
   uncheck (disable) the use of monochrome (visually less obtrusive) icons.

-.. note:: This option can be useful on Mac OS X platforms.
+.. note:: This option can be useful on MAC OSX platforms.

 * ``About`` field: Provides information about the software authors along with
  pertinent build conditions.
@@ -225,29 +230,24 @@ Specifying Proxy Settings
 ^^^^^^^^^^^^^^^^^^^^^^^^^

 * ``No Proxy`` option: Do not use a proxy.
-
 * ``Use system proxy`` option: Default setting. Follows the systems proxy
  settings.
-
 * ``Specify proxy manually as`` option: Enables you to specify
  the following custom proxy settings:
-
  - ``HTTP(S)``: Used when you are required to use an HTTP(S) proxy server (for 
  example, Squid or Microsoft Forefront TMG). 
-  
-  - ``SOCKSv5``: Typically used in special company LAN setups, or in 
-  combination with the OpenSSH dynamic application level forwarding feature 
-  (see ``ssh -D``).
-  
+  - ``SOCKSv5``: Typically used in special company LAN setups, or in combination 
+  with the OpenSSH
+  dynamic application level forwarding feature (see ``ssh -D``).
  - ``Host``: Host name or IP address of the proxy server along with the port 
  number. HTTP proxies typically listen over Ports 8080 (default) or 3128. 
  SOCKS servers typically listen over port 1080.
-
 * ``Proxy Server requires authentication`` checkbox: Provides the option to 
-  check (enable/require) or uncheck (disable/not require) proxy server 
-  authentication. When not checked, the proxy server must be configured to 
-  allow anonymous usage. When checked, a proxy server username and password is 
-  required.
+  check (enable/require) or
+  uncheck (disable/not require) proxy server authentication. When not checked, 
+  the proxy server must
+  be configured to allow anonymous usage. When checked, a proxy server username 
+  and password is required.

 Bandwidth Limiting
 ^^^^^^^^^^^^^^^^^^
@@ -283,8 +283,8 @@ Using the Ignored Files Editor

 .. index:: ignored files, exclude files, pattern

-You might have some local files or directories that you do not want to backup 
-and store on the server. To identify and exclude these files or directories, you
+You might have some files or directories that you do not want to backup and
+store on the server. To identify and exclude these files or directories, you
 can use the *Ignored Files Editor*.

 .. image:: images/ignored_files_editor.png
@@ -1,28 +1,23 @@
-You have the option of starting your ownCloud desktop client with the 
-``owncloud`` command. The following options are supported:
+When invoking the client from the command line, the following options are supported:

-``owncloud -h`` or ``owncloud --help``
-        Displays all command options.
-
-The other options are:
+``-h``, ``--help``
+        Displays all the options below or, when used on Windows, opens a window displaying all options.

 ``--logwindow``
        Opens a window displaying log output.

 ``--logfile`` `<filename>`
-        Write log output to the file specified. To write to stdout, specify `-` 
-        as the filename.
+        Write log output to the file specified. To write to stdout, specify `-` as the filename.

 ``--logdir`` `<name>`
-        Writes each synchronization log output in a new file in the specified 
-        directory.
-        
+        Writes each synchronization log output in a new file in the specified directory.
+
 ``--logexpire`` `<hours>`
-        Removes logs older than the value specified (in hours). This command is 
-        used with ``--logdir``.
+        Removes logs older than the value specified (in hours). This command is used with ``--logdir``.

 ``--logflush``
        Clears (flushes) the log file after each write action.

 ``--confdir`` `<dirname>`
-        Uses the specified configuration directory.
+        Uses the specified configuration directory.
+
@@ -1,56 +1,60 @@
-The ownCloud Client packages contain a command, ``owncloudcmd``, that can be 
-used to synchronize ownCloud files to client machines.
+The ownCloud Client packages contain a command line client that can be used to
+synchronize ownCloud files to client machines. The command line client is
+called ``owncloudcmd``.

-``owncloudcmd`` performs a single *sync run* and then exits the synchronization 
-process. In this manner, ``owncloudcmd`` processes the differences between 
-client and server directories and propagates the files to bring both 
-repositories to the same state. Contrary to the GUI-based client, 
-``owncloudcmd`` does not repeat synchronizations on its own. It also does not 
-monitor for file system changes.
+owncloudcmd performs a single *sync run* and then exits the synchronization
+process. In this manner, owncloudcmd processes the differences between client
+and server directories and propagates the files to bring both repositories to
+the same state. Contrary to the GUI-based client, owncloudcmd does not repeat
+synchronizations on its own. It also does not monitor for file system changes.

-To invoke ``owncloudcmd``, you must provide the local and the remote repository 
-URL using the following command::
+To invoke the owncloudcmd, you must provide the local and the remote repository
+urls using the following command::

  owncloudcmd [OPTIONS...] sourcedir owncloudurl

 where ``sourcedir`` is the local directory and ``owncloudurl`` is
 the server URL.

-Other command line switches supported by ``owncloudcmd`` include the following:
+.. note:: Prior to the 1.6 version of owncloudcmd, the tool only accepted
+   ``owncloud://`` or ``ownclouds://`` in place of ``http://`` and ``https://`` as
+   a scheme. See ``Examples`` for details.
+
+Other comand line switches supported by owncloudcmd include the following:

 ``--user``, ``-u`` ``[user]``
-      Specify the user's login name.
+       Use ``user`` as the login name.

 ``--password``, ``-p`` ``[password]``
-      Specify the user's password.
+       Use ``password`` as the password.

 ``-n``
-      Use ``netrc (5)`` for login.
+       Use ``netrc (5)`` for login.

 ``--non-interactive``
-      Do not prompt for questions.
+       Do not prompt for questions.

 ``--silent``, ``-s``
-      Inhibits verbose log output.
+       Inhibits verbose log output.

 ``--trust``
-      Trust any SSL certificate, including invalid ones.
+       Trust any SSL certificate, including invalid ones.

 ``--httpproxy  http://[user@pass:]<server>:<port>``
      Uses the specified ``server`` as the HTTP proxy.
-      
-``--unsyncedfolders [file]`` 
-      File containing list of folders to not sync

 Credential Handling
 ~~~~~~~~~~~~~~~~~~~

-By default, ``owncloudcmd`` reads the client configuration and uses the 
-credentials of the GUI synchronization client. If no client is configured, or if 
-you choose to use a different user to synchronize, you can specify the user 
-password setting with the usual URL pattern.  For example::
+By default, owncloudcmd reads the client configuration and uses the credentials
+of the GUI syncrhonization client. If no client is configured, or if you choose
+to use a different user to synchronize, you can specify the user password
+setting with the usual URL pattern.  For example::

-  $ owncloudcmd / https://carla:secret@server/owncloud/remote.php/webdav/
+  https://user:secret@192.168.178.2/remote.php/webdav
+
+Example
+~~~~~~~

 To synchronize the ownCloud directory ``Music`` to the local directory
 ``media/music``, through a proxy listening on port ``8080``, and on a gateway
@@ -60,5 +64,13 @@ machine using IP address ``192.168.178.1``, the command line would be::
                $HOME/media/music \
                https://server/owncloud/remote.php/webdav/Music

-``owncloudcmd`` will prompt for the user name and password, unless they have
-been specified on the command line or ``-n`` has been passed.
+``owncloudcmd`` will enquire user name and password, unless they have
+been specified on the command line or ``-n`` has been passed.
+
+Using the legacy scheme, the command line would be::
+
+  $ owncloudcmd --httpproxy http://192.168.178.1:8080 \
+                $HOME/media/music \
+                ownclouds://server/owncloud/remote.php/webdav/Music
+
+
@@ -15,15 +15,21 @@ Identifying Basic Functionality Problems
 :Performing a general ownCloud Server test:
  The first step in troubleshooting synchronization issues is to verify that
  you can log on to the ownCloud web application. To verify connectivity to the
-  ownCloud server try logging in via your Web browser.
-  
+  ownCloud server:
+
+  - Open a browser window and enter the server address to your own server in the location/address bar.
+
+  For example, if your ownCloud instance is installed at URL address
+  ``http://yourserver.com/owncloud``, enter ``http://yourserver.com/owncloud/``
+  into your browsers location/address bar.
+   
  If you are not prompted for your username and password, or if a red warning
  box appears on the page, your server setup requires modification. Please verify
  that your server installation is working correctly.

 :Ensure the WebDAV API is working:
  If all desktop clients fail to connect to the ownCloud Server, but access
-  using the Web interface functions properly, the problem is often a
+  using the web interface functions properly, the problem is often a
  misconfiguration of the WebDAV API.

  The ownCloud Client uses the built-in WebDAV access of the server content.
@@ -41,13 +47,13 @@ Identifying Basic Functionality Problems
  authentication backend is configured properly.

 :Use a WebDAV command line tool to test:  
-  A more sophisticated test method for troubleshooting synchronization issues
+  A more sophisticated test method for troubleshooting syncrhonization issues
  is to use a WebDAV command line client and log into the ownCloud WebDAV server.
-  One such command line client -- called ``cadaver`` -- is available for Linux
+  One such command line client -- called cadaver -- is available for Linux
  distributions. You can use this application to further verify that the WebDAV
  server is running properly using PROPFIND calls.  

-  As an example, after installing the ``cadaver`` app, you can issue the
+  As an example, after installing the cadaver app, you can issue the
  ``propget`` command to obtain various properties pertaining to the current
  directory and also verify WebDAV server connection.

@@ -61,12 +67,12 @@ Other issues can affect synchronization of your ownCloud files:
  ensure that the folder to which you are synchronizing is not shared with
  other synchronization applications.

- Synchronizing the same directory with ownCloud and other synchronization
-  software such as Unison, rsync, Microsoft Windows Offline Folders, or other
-  cloud services such as DropBox or Microsoft SkyDrive is not supported and
-  should not be attempted. In the worst case, it is possible that synchronizing
-  folders or files using ownCloud and other synchronization software or
-  services can result in data loss.
+  .. note:: Synchronizing the same directory with ownCloud and other
+  synchronization software such as Unison, rsync, Microsoft Windows Offline
+  Folders, or other cloud services such as DropBox or Microsoft SkyDrive is not
+  supported and should not be attempted. In the worst case, it is possible that
+  synchronizing folders or files using ownCloud and other synchronization
+  software or services can result in data loss.

 - If you find that only specific files are not synrchronized, the
  synchronization protocol might be having an effect. Some files are
@@ -80,13 +86,9 @@ Other issues can affect synchronization of your ownCloud files:

  .. note:: The data directory on the server is exclusive to ownCloud and must not be modified manually.

- If you are using a different file backend on the server, you can try to exclude a bug in the
+  If you are using a different file backend on the server, you can try to exclude a bug in the
  backend by reverting to the built-in backend.

- If you are experiencing slow upload/download speed or similar performance issues
-  be aware that those could be caused by on-access virus scanning solutions, either
-  on the server (like the files_antivirus app) or the client.
-
 Log Files
 ---------

@@ -129,9 +131,9 @@ mentioned above to save the log to a file.
  .. note:: You can also open a log window for an already running session, by
     restarting the client using the following command:

-     * Windows: ``C:\Program Files (x86)\ownCloud\owncloud.exe --logwindow``
-     * Mac OS X: ``/Applications/owncloud.app/Contents/MacOS/owncloud --logwindow``
-     * Linux: ``owncloud --logwindow``
+  * Windows: ``C:\Program Files (x86)\ownCloud\owncloud.exe --logwindow``
+  * Mac OS X: ``/Applications/owncloud.app/Contents/MacOS/owncloud --logwindow``
+  * Linux: ``owncloud --logwindow``

 Saving Files Directly
 ~~~~~~~~~~~~~~~~~~~~~
@@ -198,7 +200,7 @@ You can find more information about Apache logging at
 Core Dumps
 ----------

-On Mac OS X and Linux systems, and in the unlikely event the client software
+On MAC OS X and Linux systems, and in the unlikely event the client software
 crashes, the client is able to write a core dump file.  Obtaining a core dump
 file can assist ownCloud Customer Support tremendously in the debugging
 process. 
@@ -186,26 +186,13 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
      painter->drawPixmap(QPoint(warnRect.left(), warnRect.top()),pm );
  }

-  auto palette = option.palette;
-
-  if (qApp->style()->inherits("QWindowsVistaStyle")) {
-      // Hack: Windows Vista's light blue is not contrasting enough for white
-
-      // (code from QWindowsVistaStyle::drawControl for CE_ItemViewItem)
-      palette.setColor(QPalette::All, QPalette::HighlightedText, palette.color(QPalette::Active, QPalette::Text));
-      palette.setColor(QPalette::All, QPalette::Highlight, palette.base().color().darker(108));
-  }
-
-
-  QPalette::ColorGroup cg = option.state & QStyle::State_Enabled
-                          ? QPalette::Normal : QPalette::Disabled;
-  if (cg == QPalette::Normal && !(option.state & QStyle::State_Active))
-      cg = QPalette::Inactive;
-
-  if (option.state & QStyle::State_Selected) {
-      painter->setPen(palette.color(cg, QPalette::HighlightedText));
+  if ((option.state & QStyle::State_Selected)
+          && (option.state & QStyle::State_Active)
+          // Hack: Windows Vista's light blue is not contrasting enough for white
+          && !qApp->style()->inherits("QWindowsVistaStyle")) {
+      painter->setPen(option.palette.color(QPalette::HighlightedText));
  } else {
-      painter->setPen(palette.color(cg, QPalette::Text));
+      painter->setPen(option.palette.color(QPalette::Text));
  }
  QString elidedAlias = aliasFm.elidedText(aliasText, Qt::ElideRight, aliasRect.width());
  painter->setFont(aliasFont);
@@ -285,7 +272,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
      pBarOpt.maximum  = 100;
      pBarOpt.progress = overallPercent;
      pBarOpt.orientation = Qt::Horizontal;
-      pBarOpt.palette = palette;
+      pBarOpt.palette = option.palette;
      pBarOpt.rect = pBRect;

      QApplication::style()->drawControl( QStyle::CE_ProgressBar, &pBarOpt, painter );
@@ -526,7 +526,7 @@ void GETFileJob::slotMetaDataChanged()
    }
    if (start != _resumeStart) {
        qDebug() << Q_FUNC_INFO <<  "Wrong content-range: "<< ranges << " while expecting start was" << _resumeStart;
-        if (ranges.isEmpty()) {
+        if (start == 0) {
            // device don't support range, just stry again from scratch
            _device->close();
            if (!_device->open(QIODevice::WriteOnly)) {
@@ -45,7 +45,6 @@
 #include <QSslCertificate>
 #include <QProcess>
 #include <QElapsedTimer>
-#include <qtextcodec.h>

 namespace Mirall {

@@ -315,16 +314,7 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
 {
    if( ! file ) return -1;

-    QTextCodec::ConverterState utf8State;
-    QTextCodec *codec = QTextCodec::codecForName("UTF-8");
-    Q_ASSERT(codec);
-    QString fileUtf8 = codec->toUnicode(file->path, qstrlen(file->path), &utf8State);
-
-    auto instruction = file->instruction;
-    if (utf8State.invalidChars > 0) {
-        qDebug() << "File ignored because of invalid utf-8 sequence: " << file->path;
-        instruction = CSYNC_INSTRUCTION_IGNORE;
-    }
+    QString fileUtf8 = QString::fromUtf8( file->path );

    // Gets a default-contructed SyncFileItem or the one from the first walk (=local walk)
    SyncFileItem item = _syncItemMap.value(fileUtf8);
@@ -332,12 +322,12 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
    item._originalFile = item._file;

    if (item._instruction == CSYNC_INSTRUCTION_NONE
-            || (item._instruction == CSYNC_INSTRUCTION_IGNORE && instruction != CSYNC_INSTRUCTION_NONE)) {
-        item._instruction = instruction;
+            || (item._instruction == CSYNC_INSTRUCTION_IGNORE && file->instruction != CSYNC_INSTRUCTION_NONE)) {
+        item._instruction = file->instruction;
        item._modtime = file->modtime;
    } else {
-        if (instruction != CSYNC_INSTRUCTION_NONE) {
-            qDebug() << "ERROR: Instruction" << item._instruction << "vs" << instruction << "for" << fileUtf8;
+        if (file->instruction != CSYNC_INSTRUCTION_NONE) {
+            qDebug() << "ERROR: Instruction" << item._instruction << "vs" << file->instruction << "for" << fileUtf8;
            Q_ASSERT(!"Instructions are both unequal NONE");
            return -1;
        }
@@ -391,12 +381,6 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
        /* No error string */
    }

-    if (item._instruction == CSYNC_INSTRUCTION_IGNORE && utf8State.invalidChars > 0) {
-        item._status = SyncFileItem::NormalError;
-        //item._instruction = CSYNC_INSTRUCTION_ERROR;
-        item._errorString = tr("Filename encoding is not valid");
-    }
-
    item._isDirectory = file->type == CSYNC_FTW_TYPE_DIR;

    // The etag is already set in the previous sync phases somewhere. Maybe we should remove it there
@@ -15,7 +15,6 @@
 #include "theme.h"
 #include "version.h"
 #include "config.h"
-#include "utility.h"

 #include <QtCore>
 #ifndef TOKEN_AUTH_ONLY
@@ -185,7 +184,11 @@ QString Theme::systrayIconFlavor(bool mono) const
 {
    QString flavor;
    if (mono) {
-        flavor = Utility::hasDarkSystray() ? QLatin1String("white") : QLatin1String("black");
+#ifdef Q_OS_MAC
+        flavor = QLatin1String("black");
+#else
+        flavor = QLatin1String("white");
+#endif
    } else {
        flavor = QLatin1String("colored");
    }
@@ -16,7 +16,6 @@
 #define _THEME_H

 #include "mirall/syncresult.h"
-#include <QObject>


 class QIcon;
@@ -335,11 +335,6 @@ QString Utility::timeToDescriptiveString(QList<QPair<QString,quint32> > &timeMap
    return retStr;
 }

-bool Utility::hasDarkSystray()
-{
-    return hasDarkSystray_private();
-}
-

 bool Utility::isWindows()
 {
@@ -71,19 +71,7 @@ namespace Utility
     */
    OWNCLOUDSYNC_EXPORT QString timeToDescriptiveString(QList<QPair<QString,quint32> > &timeMapping, quint64 msecs, quint8 precision, QString separator, bool specific);
    OWNCLOUDSYNC_EXPORT QString timeToDescriptiveString(quint64 msecs, quint8 precision, QString separator, bool specific);
-
-    /**
-     * @brief hasDarkSystray - determines whether the systray is dark or light.
-     *
-     * Use this to check if the OS has a dark or a light systray.
-     *
-     * The value might change during the execution of the program
-     * (e.g. on OS X 10.10).
-     *
-     * @return bool which is true for systems with dark systray.
-     */
-    OWNCLOUDSYNC_EXPORT bool hasDarkSystray();
-
+    
    // convinience OS detection methods
    OWNCLOUDSYNC_EXPORT bool isWindows();
    OWNCLOUDSYNC_EXPORT bool isMac();
@@ -108,18 +108,3 @@ void setLaunchOnStartup_private(const QString &appName, const QString& guiName,
    CFRelease(urlRef);
 }

-static bool hasDarkSystray_private()
-{
-    bool returnValue = false;
-    CFStringRef interfaceStyleKey = CFSTR("AppleInterfaceStyle");
-    CFStringRef interfaceStyle = NULL;
-    CFStringRef darkInterfaceStyle = CFSTR("Dark");
-    interfaceStyle = (CFStringRef)CFPreferencesCopyAppValue(interfaceStyleKey,
-                                                            kCFPreferencesCurrentApplication);
-    if (interfaceStyle != NULL) {
-        returnValue = (kCFCompareEqualTo == CFStringCompare(interfaceStyle, darkInterfaceStyle, 0));
-        CFRelease(interfaceStyle);
-    }
-    return returnValue;
-}
-
@@ -86,8 +86,3 @@ void setLaunchOnStartup_private(const QString &appName, const QString& guiName,
        }
    }
 }
-
-static inline bool hasDarkSystray_private()
-{
-    return true;
-}
@@ -47,8 +47,3 @@ void setLaunchOnStartup_private(const QString &appName, const QString& guiName,
        settings.remove(appName);
    }
 }
-
-static inline bool hasDarkSystray_private()
-{
-    return true;
-}
@@ -482,17 +482,17 @@ Esteu segur que voleu executar aquesta operació?</translation>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>Fitxer</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>Sincronitzant tots els fitxers del compte amb</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>Carpeta remota: %1</translation>
    </message>
@@ -1872,255 +1872,250 @@ No és aconsellada usar-la.</translation>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>Èxit.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>CSync ha fallat en crear un fitxer de bloqueig.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation>CSync ha fallat en carregar o crear el fitxer de revista. Assegureu-vos que yeniu permisos de lectura i escriptura en la carpeta local de sincronització.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation>CSync ha fallat en escriure el fitxer de revista</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;No s&apos;ha pogut carregar el connector %1 per csync.&lt;br/&gt;Comproveu la instal·lació!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>L&apos;hora del sistema d&apos;aquest client és diferent de l&apos;hora del sistema del servidor. Useu un servei de sincronització de temps (NTP) en el servidor i al client perquè l&apos;hora sigui la mateixa.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>CSync no ha pogut detectar el tipus de fitxers del sistema.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync ha patit un error mentre processava els àrbres interns.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync ha fallat en reservar memòria.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>Error fatal de paràmetre en CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>El pas d&apos;actualització del processat de CSync ha fallat.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>El pas de reconciliació del processat de CSync ha fallat.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>El pas de propagació del processat de CSync ha fallat.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;La carpeta destí no existeix.&lt;/p&gt;&lt;p&gt;Comproveu la configuració de sincronització&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>No es pot escriure el fitxer remot. Reviseu l&apos;acces remot.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>No es pot escriure al sistema de fitxers local. Reviseu els permisos.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSync ha fallat en connectar a través d&apos;un proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync no s&apos;ha pogut acreditar amb el proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync ha fallat en cercar el proxy o el servidor.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>L&apos;autenticació de CSync ha fallat al servidor %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync ha fallat en connectar-se a la xarxa.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation>Temps excedit en la connexió.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>S&apos;ha produït un error en la transmissió HTTP.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>CSync ha fallat en no implementar el permís denegat.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation>CSync ha fallat en accedir</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>CSync ha intentat crear una carpeta que ja existeix.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: No hi ha espai disponible al servidor %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>Error inespecífic de CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Aturat per l&apos;usuari</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation>S&apos;ha produït l&apos;error intern número %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>L&apos;element no s&apos;ha sincronitzat degut a errors previs: %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>La sincronització d&apos;enllaços simbòlics no està implementada.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation>El fitxer està a la llista d&apos;ignorats.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation>El fitxer conté caràcters no vàlids que no es poden sincronitzar entre plataformes.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>No es pot inicialitzar un periòdic de sincronització</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation>No es pot obrir el diari de sincronització</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>No es permet perquè no teniu permisos per afegir subcarpetes en aquesta carpeta</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>No es permet perquè no teniu permisos per afegir una carpeta inferior</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>No es permet perquè no teniu permisos per afegir fitxers en aquesta carpeta</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>No es permet pujar aquest fitxer perquè només és de lectura en el servidor, es restaura</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation>No es permet l&apos;eliminació, es restaura</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation>Fitxers locals i carpeta compartida esborrats.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation>No es permet moure&apos;l, l&apos;element es restaura</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>No es permet moure perquè %1 només és de lectura</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation>el destí</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation>l&apos;origen</translation>
    </message>
@@ -482,17 +482,17 @@ Opravdu chcete provést tuto akci?</translation>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>Soubor</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>Synchronizuji všechny soubory ve vašem účtu s</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>Vzdálená cesta: %1</translation>
    </message>
@@ -1114,7 +1114,7 @@ Nedoporučuje se jí používat.</translation>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="153"/>
        <source>&amp;Next &gt;</source>
-        <translation>&amp;Následující &gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="233"/>
@@ -1878,255 +1878,250 @@ Nedoporučuje se jí používat.</translation>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>Úspěch.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>CSync nemůže vytvořit soubor zámku.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation>CSync se nepodařilo načíst či vytvořit soubor žurnálu. Ujistěte se, že máte oprávnění pro čtení a zápis v místní synchronizované složce.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation>CSync se nepodařilo zapsat do souboru žurnálu.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;Plugin %1 pro csync nelze načíst.&lt;br/&gt;Zkontrolujte prosím instalaci!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>Systémový čas na klientovi je rozdílný od systémového času serveru. Použijte, prosím, službu synchronizace času (NTP) na serveru i klientovi, aby byl čas na obou strojích stejný.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>CSync nemohl detekovat typ souborového systému.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync obdrželo chybu při zpracování vnitřních struktur.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync se nezdařilo rezervovat paměť.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>CSync: kritická chyba parametrů.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>CSync se nezdařilo zpracovat krok aktualizace.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSync se nezdařilo zpracovat krok sladění.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>CSync se nezdařilo zpracovat krok propagace.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Cílový adresář neexistuje.&lt;/p&gt;&lt;p&gt;Zkontrolujte, prosím, nastavení synchronizace.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>Vzdálený soubor nelze zapsat. Ověřte prosím vzdálený přístup.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>Do místního souborového systému nelze zapisovat. Ověřte, prosím, přístupová práva.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSync se nezdařilo připojit skrze proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync se nemohlo přihlásit k proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync se nezdařilo najít proxy server nebo cílový server.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync se nezdařilo přihlásit k serveru %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync se nezdařilo připojit k síti.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation>Došlo k vypršení časového limitu síťového spojení.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Nastala chyba HTTP přenosu.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>CSync selhalo z důvodu nezpracovaného odmítnutí práv.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation>CSync se nezdařil přístup</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>CSync se pokusilo vytvořit adresář, který již existuje.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Nedostatek volného místa na serveru %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>Nespecifikovaná chyba CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Zrušeno uživatelem</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation>Připojený adresář je na serveru dočasně nedostupný</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation>Nastala vnitřní chyba číslo %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Položka nebyla synchronizována kvůli předchozí chybě: %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Symbolické odkazy nejsou při synchronizaci podporovány.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation>Pevné odkazy nejsou při synchronizaci podporovány.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation>Soubor se nachází na seznamu ignorovaných.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation>Soubor obsahuje alespoň jeden neplatný znak, který narušuje synchronizaci v prostředí více platforem.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation>Kódování znaků jména soubor je neplatné</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Nemohu inicializovat synchronizační žurnál.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation>Nelze otevřít synchronizační žurnál</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorováno podle nastavení &quot;vybrat co synchronizovat&quot;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Není povoleno, protože nemáte oprávnění vytvářet podadresáře v tomto adresáři.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Není povoleno, protože nemáte oprávnění vytvořit rodičovský adresář</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Není povoleno, protože nemáte oprávnění přidávat soubory do tohoto adresáře</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Není povoleno nahrát tento soubor, protože je na serveru uložen pouze pro čtení, obnovuji</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Odstranění není povoleno, obnovuji</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation>Místní soubory a sdílený adresář byly odstraněny.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation>Přesun není povolen, položka obnovena</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Přesun není povolen, protože %1 je pouze pro čtení</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation>cílové umístění</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation>zdroj</translation>
    </message>
@@ -483,17 +483,17 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>Datei</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>Synchronisiere alle Dateien in Ihrem Konto mit</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>Remote-Pfad: %1</translation>
    </message>
@@ -527,7 +527,7 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="100"/>
        <source>No valid local folder selected!</source>
-        <translation>Keinen gültigen lokalen Ordner gewählt!</translation>
+        <translation>Keinen gültigen lokales Ordner gewählt!</translation>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="105"/>
@@ -712,7 +712,7 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
    <message>
        <location filename="../src/creds/httpcredentials.cpp" line="375"/>
        <source>Please enter %1 password for user &apos;%2&apos;:</source>
-        <translation>Bitte %1 Passwort für den Benutzer &apos;%2&apos; eingeben:</translation>
+        <translation>Bitte %1 Passwort für den Nutzer &apos;%2&apos; eingeben:</translation>
    </message>
 </context>
 <context>
@@ -1115,7 +1115,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="153"/>
        <source>&amp;Next &gt;</source>
-        <translation>&amp;Weiter &gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="233"/>
@@ -1299,7 +1299,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
    <message>
        <location filename="../src/mirall/propagator_legacy.cpp" line="363"/>
        <source>Sync was aborted by user.</source>
-        <translation>Synchronisation wurde durch den Benutzer abgebrochen.</translation>
+        <translation>Synchronisation wurde durch den Nutzer abgebrochen.</translation>
    </message>
    <message>
        <location filename="../src/mirall/propagator_legacy.cpp" line="416"/>
@@ -1429,7 +1429,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
    <message>
        <location filename="../src/mirall/propagator_legacy.cpp" line="174"/>
        <source>Sync was aborted by user.</source>
-        <translation>Synchronisation wurde durch den Benutzer abgebrochen.</translation>
+        <translation>Synchronisation wurde durch den Nutzer abgebrochen.</translation>
    </message>
    <message>
        <location filename="../src/mirall/propagator_legacy.cpp" line="180"/>
@@ -1609,7 +1609,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
    <message>
        <location filename="../src/mirall/settingsdialog.cpp" line="60"/>
        <source>Account</source>
-        <translation>Benutzerkonto</translation>
+        <translation>Nutzerkonto</translation>
    </message>
 </context>
 <context>
@@ -1622,7 +1622,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
    <message>
        <location filename="../src/mirall/settingsdialogmac.cpp" line="67"/>
        <source>Account</source>
-        <translation>Benutzerkonto</translation>
+        <translation>Nutzerkonto</translation>
    </message>
    <message>
        <location filename="../src/mirall/settingsdialogmac.cpp" line="71"/>
@@ -1875,255 +1875,250 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>Erfolgreich</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>CSync konnte keine lock-Datei erstellen.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation>CSync konnte den Synchronisationsbericht nicht laden oder erstellen. Stellen Sie bitte sicher, dass Sie Lese- und Schreibrechte auf das lokale Synchronisationsverzeichnis haben.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation>CSync konnte den Synchronisationsbericht nicht schreiben.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;Das %1-Plugin für csync konnte nicht geladen werden.&lt;br/&gt;Bitte überprüfen Sie die Installation!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>Die Uhrzeit auf diesem Computer und dem Server sind verschieden. Bitte verwenden Sie ein Zeitsynchronisationsprotokolls (NTP) auf Ihrem Server und Klienten, damit die gleiche Uhrzeit verwendet wird.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>CSync konnte den Typ des Dateisystem nicht feststellen.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync hatte einen Fehler bei der Verarbeitung von internen Strukturen.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync konnte keinen Speicher reservieren.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>CSync hat einen schwerwiegender Parameterfehler festgestellt.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>CSync Verarbeitungsschritt &quot;Aktualisierung&quot; fehlgeschlagen.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSync Verarbeitungsschritt &quot;Abgleich&quot; fehlgeschlagen.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>CSync Verarbeitungsschritt &quot;Übertragung&quot; fehlgeschlagen.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Das Zielverzeichnis existiert nicht.&lt;/p&gt;&lt;p&gt;Bitte prüfen Sie die Synchronisationseinstellungen.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>Eine Remote-Datei konnte nicht geschrieben werden. Bitte den Remote-Zugriff überprüfen.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>Kann auf dem lokalen Dateisystem nicht schreiben. Bitte Berechtigungen überprüfen.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSync konnte sich nicht über einen Proxy verbinden.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync konnte sich nicht am Proxy authentifizieren.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync konnte den Proxy oder Server nicht auflösen.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync konnte sich nicht am Server %1 authentifizieren.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync konnte sich nicht mit dem Netzwerk verbinden.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation>Eine Zeitüberschreitung der Netzwerkverbindung ist aufgetreten.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Es hat sich ein HTTP-Übertragungsfehler ereignet.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>CSync wegen fehlender Berechtigung fehlgeschlagen.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation>CSync-Zugriff fehlgeschlagen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>CSync versuchte, ein Verzeichnis zu erstellen, welches bereits existiert.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Kein Platz auf Server %1 frei.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>CSync unbekannter Fehler.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Abbruch durch den Benutzer</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation>Das eingehangene Verzeichnis ist auf dem Server temporär nicht verfügbar</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation>Interne Fehlernummer %1 aufgetreten.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Das Element ist aufgrund vorheriger Fehler nicht synchronisiert: %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Symbolische Verknüpfungen werden bei der Synchronisation nicht unterstützt.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation>Harte Verknüpfungen werden bei der Synchronisation nicht unterstützt.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation>Die Datei ist in der Ignorierliste geführt.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation>Die Datei beinhaltet ungültige Zeichen und kann nicht plattformübergreifend synchronisiert werden.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation>Dateikodierung ist ungültig</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation>Synchronisationsbericht kann nicht geöffnet werden</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Aufgrund der »Zu synchronisierende Elemente auswählen«-Sperrliste ignoriert</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Hauptordnern haben</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Nicht erlaubt, da Sie keine Rechte zum Hinzufügen von Dateien in diesen Ordner haben</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist, Wiederherstellung</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Löschen nicht erlaubt, Wiederherstellung</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation>Lokale Dateien und Freigabeordner wurden entfernt.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation>Verschieben nicht erlaubt, Element wiederhergestellt</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Verschieben nicht erlaubt, da %1 schreibgeschützt ist</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation>Das Ziel</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation>Die Quelle</translation>
    </message>
@@ -37,7 +37,7 @@
    <message>
        <location filename="../src/mirall/folderwizardtargetpage.ui" line="140"/>
        <source>Create Folder</source>
-        <translation>Δημιουργία Φακέλου</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/folderwizardtargetpage.ui" line="160"/>
@@ -483,17 +483,17 @@ Are you sure you want to perform this operation?</source>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>Αρχείο</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>Συγχρονισμός όλων των αρχείων στο λογαριασμό σας με</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>Απομακρυσμένη διαδρομή: %1</translation>
    </message>
@@ -580,12 +580,12 @@ Are you sure you want to perform this operation?</source>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="257"/>
        <source>Create Remote Folder</source>
-        <translation>Δημιουργία Απομακρυσμένου Φακέλου</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="258"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
-        <translation>Εισάγετε το όνομα του νέου φακέλου που θα δημιουργηθεί παρακάτω &apos;%1&apos;:</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="287"/>
@@ -1115,12 +1115,12 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="153"/>
        <source>&amp;Next &gt;</source>
-        <translation>&amp;Επόμενο &gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="233"/>
        <source>&lt;p&gt;Could not connect securely:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Do you want to connect unencrypted instead (not recommended)?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Αδυναμία ασφαλούς σύνδεσης:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Θα θέλατε παρ&apos;όλα αυτά να συνδεθείτε χωρίς κρυπτογράφηση (δεν προτείνεται);&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="234"/>
@@ -1332,12 +1332,12 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/mirall/propagator_qnam.cpp" line="755"/>
        <source>The file could not be downloaded completely.</source>
-        <translation>Η λήψη του αρχείου δεν ολοκληρώθηκε.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/propagator_qnam.cpp" line="791"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
-        <translation>Το αρχείο %1 δεν είναι δυνατό να αποθηκευτεί λόγω διένεξης με το όνομα ενός τοπικού ονόματος αρχείου!</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -1536,25 +1536,19 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/mirall/protocolwidget.cpp" line="262"/>
        <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source>
-        <translation>Προς το παρόν κανένα αρχείο δεν θα αγνοηθεί λόγω προηγούμενων σφαλμάτων και δεν υπάρχουν λήψεις σε εξέλιξη.</translation>
+        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="265"/>
        <source>%n files are ignored because of previous errors.
 </source>
-        <translation><numerusform>%n αρχεία αγνοήθηκαν λόγω προηγούμενων σφαλμάτων.
-
-</numerusform><numerusform>%n αρχεία αγνοήθηκαν λόγω προηγούμενων σφαλμάτων.
-
-</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="266"/>
        <source>%n files are partially downloaded.
 </source>
-        <translation><numerusform>%n αρχεία λήφθηκαν μερικώς.
-</numerusform><numerusform>%n αρχεία λήφθηκαν μερικώς.
-</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
        <location filename="../src/mirall/protocolwidget.cpp" line="267"/>
@@ -1572,7 +1566,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/mirall/selectivesyncdialog.cpp" line="274"/>
        <source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
-        <translation>Οι μη επιλεγμένοι φάκελοι θα &lt;b&gt;αφαιρεθούν&lt;/ b&gt; από το τοπικό σύστημα αρχείων σας και δεν θα συγχρονιστούν πια με αυτόν τον υπολογιστή</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -1879,255 +1873,250 @@ It is not advisable to use it.</source>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>Επιτυχία.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>Το CSync απέτυχε να δημιουργήσει ένα αρχείο κλειδώματος.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation>Το CSync απέτυχε να φορτώσει ή να δημιουργήσει το αρχείο καταλόγου. Βεβαιωθείτε ότι έχετε άδειες ανάγνωσης και εγγραφής στον τοπικό κατάλογο συγχρονισμού.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation>Το CSync απέτυχε να εγγράψει στο αρχείο καταλόγου.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;Το πρόσθετο του %1 για το csync δεν μπόρεσε να φορτωθεί.&lt;br/&gt;Παρακαλούμε επαληθεύσετε την εγκατάσταση!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>Η ώρα του συστήματος στον τοπικό υπολογιστή διαφέρει από την ώρα του συστήματος στο διακομιστή. Παρακαλούμε χρησιμοποιήστε μια υπηρεσία χρονικού συγχρονισμού (NTP) στο διακομιστή και στον τοπικό υπολογιστή ώστε η ώρα να παραμένει η ίδια.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>To CSync δεν μπορούσε να ανιχνεύσει τον τύπο του συστήματος αρχείων.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>Το CSync έλαβε κάποιο μήνυμα λάθους κατά την επεξεργασία της εσωτερικής διεργασίας.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>Το CSync απέτυχε να δεσμεύσει μνήμη.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>Μοιραίο σφάλμα παράμετρου CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>Η ενημέρωση του βήματος επεξεργασίας του CSync απέτυχε.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSync στάδιο επεξεργασίας συμφιλίωση απέτυχε. </translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>Η μετάδοση του βήματος επεξεργασίας του CSync απέτυχε.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Ο κατάλογος προορισμού δεν υπάρχει.&lt;/p&gt;&lt;p&gt;Παρακαλώ ελέγξτε τις ρυθμίσεις συγχρονισμού.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>Ένα απομακρυσμένο αρχείο δεν μπορεί να εγγραφεί. Παρακαλούμε ελέγξτε την απομακρυσμένη πρόσβαση.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>Το τοπικό σύστημα αρχείων δεν είναι εγγράψιμο. Παρακαλούμε ελέγξτε τα δικαιώματα.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>Το CSync απέτυχε να συνδεθεί μέσω ενός διαμεσολαβητή. </translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>Το CSync δεν μπόρεσε να πιστοποιηθεί στο διακομιστή μεσολάβησης.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>Το CSync απέτυχε να διερευνήσει το διαμεσολαβητή ή το διακομιστή.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>Το CSync απέτυχε να πιστοποιηθεί στο διακομιστή 1%. </translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>Το CSync απέτυχε να συνδεθεί με το δίκτυο.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation>Διακοπή σύνδεσης δικτύου λόγω παρέλευσης χρονικού ορίου.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Ένα σφάλμα μετάδοσης HTTP συνέβη.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>Το CSync απέτυχε λόγω απόρριψης μη-διαχειρίσιμων δικαιωμάτων.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation>Το CSync απέτυχε να αποκτήσει πρόσβαση</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>Το CSync προσπάθησε να δημιουργήσει ένα κατάλογο που υπάρχει ήδη.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Δεν υπάρχει διαθέσιμος χώρος στο διακομιστή 1%.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>Άγνωστο σφάλμα CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Ματαιώθηκε από το χρήστη</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
-        <translation>Ο προσαρτημένος φάκελος δεν είναι διαθέσιμος προσωρινά στο διακομιστή</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation>Συνέβη εσωτερικό σφάλμα με αριθμό %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Το αντικείμενο δεν είναι συγχρονισμένο λόγω προηγούμενων σφαλμάτων: %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Οι συμβολικού σύνδεσμοι δεν υποστηρίζονται για το συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation>Οι συνδέσεις υλικού δεν υποστηρίζονται για συγχρονισμό.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation>Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation>Το αρχείο περιέχει άκυρους χαρακτήρες που δεν μπορούν να συγχρονιστούν σε όλα τα συστήματα.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation>Η κωδικοποίηση του ονόματος αρχείου δεν είναι έγκυρη</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Αδυναμία προετοιμασίας αρχείου συγχρονισμού.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation>Αδυναμία ανοίγματος του αρχείου συγχρονισμού</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Αγνοήθηκε εξαιτίας της μαύρης λίστας &quot;διάλεξε τι να συγχρονιστεί&quot;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε υπο-καταλόγους σε αυτό τον κατάλογο</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε στο γονεϊκό κατάλογο</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Δεν επιτρέπεται επειδή δεν έχεται δικαιώματα να προσθέσετε αρχεία σε αυτόν τον κατάλογο</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Δεν επιτρέπεται να μεταφορτώσετε αυτό το αρχείο επειδή είναι μόνο για ανάγνωση στο διακομιστή, αποκατάσταση σε εξέλιξη</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation>Οι τοπικοί φάκελοι και ο φάκελος κοινής χρήσης αφαιρέθηκαν.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation>Η μετακίνηση δεν επιτρέπεται, το αντικείμενο αποκαταστάθηκε</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Η μετακίνηση δεν επιτρέπεται επειδή το %1 είναι μόνο για ανάγνωση</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation>ο προορισμός</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation>η προέλευση</translation>
    </message>
@@ -2145,17 +2134,17 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="234"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Έκδοση %1. Για περισσότερες πληροφορίες δείτε &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="238"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorparated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Πνευματικά δικαιώματα ownCloud, Ε.Π.Ε.&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="239"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Διανέμεται από 1% και υπό την άδεια GNU General Public License (GPL) έκδοση 2.0.&lt;br/&gt;% 2 και το 2% το λογότυπο είναι σήματα κατατεθέντα της 1% στις Ηνωμένες Πολιτείες, άλλες χώρες, ή και τα δύο.&lt;/ p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -481,17 +481,17 @@ Are you sure you want to perform this operation?</source>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation type="unfinished"></translation>
    </message>
@@ -1871,255 +1871,250 @@ It is not advisable to use it.</source>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation type="unfinished"></translation>
    </message>
@@ -65,7 +65,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.ui" line="143"/>
        <source>Account Maintenance</source>
-        <translation>Mantenimiento de cuenta</translation>
+        <translation>Mantenimiento de Cuenta</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.ui" line="152"/>
@@ -80,7 +80,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.ui" line="20"/>
        <source>Account to Synchronize</source>
-        <translation>Cuenta para sincronizar</translation>
+        <translation>Cuenta para Sincronizar</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.ui" line="41"/>
@@ -111,7 +111,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.ui" line="101"/>
        <source>Storage Usage</source>
-        <translation>Uso de almacenamiento</translation>
+        <translation>Uso de Almacenamiento</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.ui" line="123"/>
@@ -136,7 +136,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="339"/>
        <source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will not remove the files from your client.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;¿Realmente desea dejar de sincronizar la carpeta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto no eliminará los archivos de su cliente.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Realmente desea dejar de sincronizar la carpeta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; Esto no eliminará los archivos de su cliente.&lt;/p&gt;</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="375"/>
@@ -146,7 +146,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="376"/>
        <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>&lt;p&gt;¿Realmente desea restablecer la carpeta &lt;i&gt;%1&lt;/i&gt; y reconstruir la base de datos de cliente?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esta función es para mantenimiento únicamente. No se eliminarán archivos, pero se puede causar alto tráfico en la red y puede tomar varios minutos u horas para terminar, dependiendo del tamaño de la carpeta. Únicamente utilice esta opción si así lo indica su administrador.&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Realmente desea restablecer la carpeta &lt;i&gt;%1&lt;/i&gt; y reconstruir la base de datos de cliente?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esta función es para mantenimiento únicamente. No se eliminarán archivos, pero se puede causar alto tráfico en la red y puede tomar varios minutos u horas para terminar, dependiendo del tamaño de la carpeta. Únicamente utilice esta opción si así lo indica su administrador.&lt;/p&gt;</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="653"/>
@@ -257,7 +257,7 @@ Tiempo restante %5</translation>
    <message>
        <location filename="../src/mirall/connectionvalidator.cpp" line="91"/>
        <source>No ownCloud account configured</source>
-        <translation>No se ha configurado ninguna cuenta de ownCloud</translation>
+        <translation>Ninguna cuenta de ownCloud se ha configurado</translation>
    </message>
    <message>
        <location filename="../src/mirall/connectionvalidator.cpp" line="106"/>
@@ -267,7 +267,7 @@ Tiempo restante %5</translation>
    <message>
        <location filename="../src/mirall/connectionvalidator.cpp" line="107"/>
        <source>Please update to the latest server and restart the client.</source>
-        <translation>Por favor, actualice a la última versión del servidor y reinicie el cliente</translation>
+        <translation>Por favor actualice a la ultima verisón del servidor y reinicie el cliente</translation>
    </message>
    <message>
        <location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
@@ -383,7 +383,7 @@ Tiempo restante %5</translation>
    <message>
        <location filename="../src/mirall/folder.cpp" line="500"/>
        <source>Sync Activity</source>
-        <translation>Actividad de la sincronización</translation>
+        <translation>Actividad en la Sincronización</translation>
    </message>
    <message>
        <location filename="../src/mirall/folder.cpp" line="745"/>
@@ -397,12 +397,12 @@ This might be because the folder was silently reconfigured, or that all the file
 Are you sure you want to perform this operation?</source>
        <translation>Esta sincronización eliminaría todos los archivos en la carpeta local de sincronización &apos;%1&apos;.
 Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a que todos los archivos fueron eliminados manualmente.
-¿Está seguro de que desea realizar esta operación?</translation>
+Está seguro de que desea realizar esta operación?</translation>
    </message>
    <message>
        <location filename="../src/mirall/folder.cpp" line="966"/>
        <source>Remove All Files?</source>
-        <translation>¿Eliminar todos los archivos?</translation>
+        <translation>Eliminar todos los archivos?</translation>
    </message>
    <message>
        <location filename="../src/mirall/folder.cpp" line="968"/>
@@ -425,7 +425,7 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
    <message>
        <location filename="../src/mirall/folderman.cpp" line="239"/>
        <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>Se ha encontrado un antiguo registro de sincronización &apos;%1&apos;; pero no se ha podido eliminar. Por favor, asegúrese de que ninguna aplicación la esté utilizando.</translation>
+        <translation>Un antiguo registro (journal) de sincronización &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="963"/>
@@ -455,7 +455,7 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
    <message>
        <location filename="../src/mirall/folderman.cpp" line="980"/>
        <source>Last Sync was successful, but with warnings on individual files.</source>
-        <translation>La última sincronización salió bien; pero hay advertencias para archivos individuales.</translation>
+        <translation>La última sincronización fue exitosa pero con advertencias para archivos individuales.</translation>
    </message>
    <message>
        <location filename="../src/mirall/folderman.cpp" line="983"/>
@@ -482,17 +482,17 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>Archivo</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>Sincronizando todos los archivos en su cuenta con</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>Ruta Remota: %1</translation>
    </message>
@@ -526,17 +526,17 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="100"/>
        <source>No valid local folder selected!</source>
-        <translation>Ninguna carpeta local válida seleccionada </translation>
+        <translation>carpeta local no válida seleccionada </translation>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="105"/>
        <source>You have no permission to write to the selected folder!</source>
-        <translation>¡Usted no tiene permiso para escribir en la carpeta seleccionada!</translation>
+        <translation>Usted no tiene permiso para escribir en la carpeta seleccionada!</translation>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="129"/>
        <source>The local path %1 is already an upload folder. Please pick another one!</source>
-        <translation>La ruta local %1 ya es una carpetas de subidas. Por favor, seleccione otra</translation>
+        <translation>La ruta local %1 es realmente la carpetas de subidas. Por favor seleccione otra!</translation>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="134"/>
@@ -546,7 +546,7 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="141"/>
        <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source>
-        <translation>La carpeta seleccionada es un enlace simbólico. Ya existe una carpeta configurada en la carpeta a la que apunta este vínculo.</translation>
+        <translation>La carpeta seleccionada es un link simbólico. Ya existe una carpeta configurada en la carpeta a la que apunta este link.</translation>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="148"/>
@@ -579,12 +579,12 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="257"/>
        <source>Create Remote Folder</source>
-        <translation>Crear carpeta remota</translation>
+        <translation>Crear Carpeta Remota</translation>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="258"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
-        <translation>Introduzca más abajo el nombre de la nueva carpeta que crear &apos;%1&apos;:</translation>
+        <translation>Introduzca más abajo el nombre de la nueva carpeta a crear &apos;%1&apos;:</translation>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="287"/>
@@ -594,17 +594,17 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="295"/>
        <source>Failed to create the folder on %1. Please check manually.</source>
-        <translation>Fallo al crear la carpeta %1. Por favor, revíselo manualmente.</translation>
+        <translation>Fallo al crear la carpeta %1. Por favor revíselo manualmente.</translation>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="344"/>
        <source>Choose this to sync the entire account</source>
-        <translation>Elija esto para sincronizar la cuenta entera</translation>
+        <translation>Escoja esto para sincronizar la cuenta entera</translation>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="399"/>
        <source>This folder is already being synced.</source>
-        <translation>Este directorio ya se ha sincronizado.</translation>
+        <translation>Este directorio ya se ha soncronizado.</translation>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="401"/>
@@ -614,7 +614,7 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="405"/>
        <source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
-        <translation>Todavía se están sincronizando ficheros. &lt;b&gt;No&lt;/b&gt; se admite la sincronización de otras carpetas. Si quiere sincronizar múltiples carpetas, por favor revise la carpeta raíz configurada.</translation>
+        <translation>Todavía se están sincronizando ficheros. La sincronización de de otras carpetas &lt;b&gt;no&lt;/b&gt; está soportada. Si quieres sincronizar múltiples carpetas, por favor revisa la carpeta raíz configurada.</translation>
    </message>
 </context>
 <context>
@@ -639,7 +639,7 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
    <message>
        <location filename="../src/mirall/propagator_qnam.cpp" line="506"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
-        <translation>No se recibió ninguna e-tag del servidor, revise el proxy/gateway</translation>
+        <translation>No se recibió ninguna e-tag del servidor, revisar el proxy/gateway</translation>
    </message>
    <message>
        <location filename="../src/mirall/propagator_qnam.cpp" line="513"/>
@@ -706,7 +706,7 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
    <message>
        <location filename="../src/creds/httpcredentials.cpp" line="374"/>
        <source>Enter Password</source>
-        <translation>Introduzca la contraseña</translation>
+        <translation>Introduzca la Contraseña</translation>
    </message>
    <message>
        <location filename="../src/creds/httpcredentials.cpp" line="375"/>
@@ -801,7 +801,7 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg
    <message>
        <location filename="../src/mirall/logbrowser.cpp" line="98"/>
        <source>Clear the log display.</source>
-        <translation>Limpiar la pantalla de registros.</translation>
+        <translation>Limpia la pantalla de registros.</translation>
    </message>
    <message>
        <location filename="../src/mirall/logbrowser.cpp" line="104"/>
@@ -938,7 +938,7 @@ Los elementos marcados también se eliminarán si impiden la eliminación de alg
    <message>
        <location filename="../src/mirall/networksettings.ui" line="272"/>
        <source>Upload Bandwidth</source>
-        <translation>Ancho de banda para subidas</translation>
+        <translation>Acho de banda de subida</translation>
    </message>
    <message>
        <location filename="../src/mirall/networksettings.ui" line="285"/>
@@ -998,7 +998,7 @@ pida privilegios adicionales durante el proceso.</translation>
    <message>
        <location filename="../src/updater/ocupdater.cpp" line="81"/>
        <source>Could not download update. Please click &lt;a href=&apos;%1&apos;&gt;here&lt;/a&gt; to download the update manually.</source>
-        <translation>No se puede descargar la actualización. Por favor, haga clic &lt;a href=&apos;%1&apos;&gt;aquí&lt;/a&gt; para iniciar una descarga manual.</translation>
+        <translation>No se puede descrgar la actualización. Por favor haga click &lt;a href=&apos;%1&apos;&gt;aqui&lt;/a&gt; para iniciar descarga manual.</translation>
    </message>
    <message>
        <location filename="../src/updater/ocupdater.cpp" line="83"/>
@@ -1051,7 +1051,7 @@ pida privilegios adicionales durante el proceso.</translation>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="129"/>
        <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!&lt;/small&gt;&lt;/p&gt;</source>
-        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Advertencia:&lt;/strong&gt;Tiene actualmente múltiples carpetas configuradas. Si continúa con los ajustes actuales, ¡la carpeta de configuración se descartará y se creará una única carpeta principal!&lt;/small&gt;&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Advertencia:&lt;/strong&gt;Tiene actualmente múltiples carpetas configuradas. Si continua con los ajustes actuales, la carpeta de configuración se descartará y se creará una única carpeta principal!&lt;/small&gt;&lt;/p&gt;</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.cpp" line="136"/>
@@ -1103,8 +1103,8 @@ pida privilegios adicionales durante el proceso.</translation>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="110"/>
        <source>This url is NOT secure as it is not encrypted.
 It is not advisable to use it.</source>
-        <translation>Esta URL NO ES SEGURA; pues no está cifrada.
-No se recomienda usarla.</translation>
+        <translation>Este URL NO ES SEGURO pues no está cifrado.
+No se recomienda usarlo.</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="114"/>
@@ -1114,7 +1114,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="153"/>
        <source>&amp;Next &gt;</source>
-        <translation>&amp;Siguiente &gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="233"/>
@@ -1137,7 +1137,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="375"/>
        <source>Folder rename failed</source>
-        <translation>Error al renombrar la carpeta</translation>
+        <translation>Error Renombrando Carpeta</translation>
    </message>
    <message>
        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="444"/>
@@ -1184,12 +1184,12 @@ No se recomienda usarla.</translation>
        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="186"/>
        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="194"/>
        <source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
-        <translation>Se falló al conectar %1 a %2:&lt;br/&gt;%3</translation>
+        <translation>Error conectando con %1 en %2:&lt;br/&gt;%3</translation>
    </message>
    <message>
        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="282"/>
        <source>No remote folder specified!</source>
-        <translation>¡No se ha especificado ninguna carpeta remota!</translation>
+        <translation>No se ha especificado la carpeta remota!</translation>
    </message>
    <message>
        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="288"/>
@@ -1220,7 +1220,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="325"/>
        <source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
-        <translation>¡La creación de la carpeta remota ha fallado debido a que las credenciales proporcionadas son incorrectas!&lt;br/&gt;Por favor, vuelva atrás y compruebe sus credenciales&lt;/p&gt;</translation>
+        <translation>¡La creación de la carpeta remota ha fallado debido a que las credenciales proporcionadas son incorrectas!&lt;br/&gt;Por favor, vuelva atrás y comprueba sus credenciales&lt;/p&gt;</translation>
    </message>
    <message>
        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="328"/>
@@ -1236,7 +1236,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="350"/>
        <source>A sync connection from %1 to remote directory %2 was set up.</source>
-        <translation>Se ha configarado una conexión de sincronización desde %1 al directorio remoto %2</translation>
+        <translation>Una conexión de sincronización desde %1 al directorio remoto %2 ha sido configurada.</translation>
    </message>
    <message>
        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/>
@@ -1259,7 +1259,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/wizard/owncloudwizard.cpp" line="74"/>
        <source>%1 Connection Wizard</source>
-        <translation>Asistente de conexión %1</translation>
+        <translation>Asistente de Conexión %1</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudwizard.cpp" line="83"/>
@@ -1298,7 +1298,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/mirall/propagator_legacy.cpp" line="363"/>
        <source>Sync was aborted by user.</source>
-        <translation>El usuario ha interrumpiado la sincronización.</translation>
+        <translation>La sincronización ha sido Interrumpida por el usuario</translation>
    </message>
    <message>
        <location filename="../src/mirall/propagator_legacy.cpp" line="416"/>
@@ -1318,7 +1318,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/mirall/propagator_legacy.cpp" line="495"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
-        <translation>¡El archivo %1 no se puede descargar a causa de un conflicto con el nombre de un archivo local!</translation>
+        <translation>¡El fichero %1 no puede ser descargado debido al nombre de la clase de un fichero local!</translation>
    </message>
 </context>
 <context>
@@ -1326,7 +1326,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/mirall/propagator_qnam.cpp" line="593"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
-        <translation>¡El archivo %1 no se puede descargar a causa de un conflicto con el nombre de un archivo local!</translation>
+        <translation>¡El fichero %1 no puede ser descargado debido al nombre de la clase de un fichero local!</translation>
    </message>
    <message>
        <location filename="../src/mirall/propagator_qnam.cpp" line="755"/>
@@ -1336,7 +1336,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/mirall/propagator_qnam.cpp" line="791"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
-        <translation>¡El fichero %1 no puede guardarse debido a un conflicto con el nombre de otro fichero local!</translation>
+        <translation>¡ El fichero %1 no puede guardar debido a un conflicto con el nombre de otro fichero local !</translation>
    </message>
 </context>
 <context>
@@ -1357,7 +1357,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/mirall/propagatorjobs.cpp" line="127"/>
        <source>Attention, possible case sensitivity clash with %1</source>
-        <translation>Atención, posible error de mayúsculas/minúsculas en %1</translation>
+        <translation>Atención, posible error de muyuscula/minisculas en %1</translation>
    </message>
    <message>
        <location filename="../src/mirall/propagatorjobs.cpp" line="132"/>
@@ -1370,7 +1370,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
        <source>Error removing &apos;%1&apos;: %2; </source>
-        <translation>Error al eliminar &apos;%1&apos;: %2; </translation>
+        <translation>Error eliminando &apos;%1&apos;: %2; </translation>
    </message>
    <message>
        <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
@@ -1428,12 +1428,12 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/mirall/propagator_legacy.cpp" line="174"/>
        <source>Sync was aborted by user.</source>
-        <translation>La sincronización ha sido interrumpida por el usuario</translation>
+        <translation>La sincronización ha sido Interrumpida por el usuario</translation>
    </message>
    <message>
        <location filename="../src/mirall/propagator_legacy.cpp" line="180"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
-        <translation>El archivo fue modificado localmente; pero es parte de una carpeta compartida en modo de sólo lectura. Ha sido recuperado y su modificación está en el archivo de conflicto.</translation>
+        <translation>El archivo fue modificado localmente, pero es parte de una carpeta compartida en modo de solo lectura. Ha sido recuperado y tu modificación está en el archivo de conflicto.</translation>
    </message>
 </context>
 <context>
@@ -1441,7 +1441,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/mirall/propagator_qnam.cpp" line="296"/>
        <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
-        <translation>El archivo fue modificado localmente; pero es parte de una carpeta compartida en modo de sólo lectura. Ha sido recuperado y su modificación está en el archivo de conflicto.</translation>
+        <translation>El archivo fue modificado localmente, pero es parte de una carpeta compartida en modo de solo lectura. Ha sido recuperado y tu modificación está en el archivo de conflicto.</translation>
    </message>
    <message>
        <location filename="../src/mirall/propagator_qnam.cpp" line="327"/>
@@ -1470,7 +1470,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/mirall/protocolwidget.ui" line="20"/>
        <source>Sync Activity</source>
-        <translation>Actividad en la sincronización</translation>
+        <translation>Actividad en la Sincronización</translation>
    </message>
    <message>
        <location filename="../src/mirall/protocolwidget.ui" line="49"/>
@@ -1510,7 +1510,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/mirall/protocolwidget.cpp" line="68"/>
        <source>Retry Sync</source>
-        <translation>Reintentar la sincronización</translation>
+        <translation>Reintentar Sincronizar</translation>
    </message>
    <message>
        <location filename="../src/mirall/protocolwidget.cpp" line="72"/>
@@ -1712,12 +1712,12 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/mirall/sslbutton.cpp" line="105"/>
        <source>Country:</source>
-        <translation>País:</translation>
+        <translation>Pais:</translation>
    </message>
    <message>
        <location filename="../src/mirall/sslbutton.cpp" line="106"/>
        <source>Serial:</source>
-        <translation>Nº serie:</translation>
+        <translation>nº serie:</translation>
    </message>
    <message>
        <location filename="../src/mirall/sslbutton.cpp" line="109"/>
@@ -1815,7 +1815,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/mirall/sslerrordialog.cpp" line="134"/>
        <source>Warnings about current SSL Connection:</source>
-        <translation>Avisos sobre la conexión SSL actual:</translation>
+        <translation>Avisos Sobre la actual conexión SSL:</translation>
    </message>
    <message>
        <location filename="../src/mirall/sslerrordialog.cpp" line="169"/>
@@ -1876,255 +1876,250 @@ No se recomienda usarla.</translation>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>Completado con éxito.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>CSync no pudo crear un fichero de bloqueo.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation>CSync falló al cargar o crear el archivo de diario. Asegúrese de tener permisos de lectura y escritura en el directorio local de sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation>CSync falló al escribir el archivo de diario.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
-        <translation>&lt;p&gt;El %1 complemento para csync no se ha podido cargar.&lt;br/&gt;Por favor, verifique la instalación&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;El %1 complemente para csync no se ha podido cargar.&lt;br/&gt;Por favor, verifique la instalación&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>La hora del sistema en este cliente es diferente de la hora del sistema en el servidor. Por favor use un servicio de sincronización de hora (NTP) en los servidores y clientes para que las horas se mantengan idénticas.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>CSync no pudo detectar el tipo de sistema de archivos.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync encontró un error mientras procesaba los árboles de datos internos.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
-        <translation>Hubo un fallo al reservar memoria para Csync</translation>
+        <translation>Fallo al reservar memoria para Csync</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>Error fatal de parámetro en CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>El proceso de actualización de CSync ha fallado.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>Falló el proceso de composición de CSync</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>Error en el proceso de propagación de CSync</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;El directorio de destino no existe.&lt;/p&gt;&lt;p&gt;Por favor verifique la configuración de sincronización.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>No se pudo escribir en un archivo remoto. Por favor, compruebe el acceso remoto.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>No se puede escribir en el sistema de archivos local. Por favor, compruebe los permisos.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSync falló al realizar la conexión a través del proxy</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync no pudo autenticar el proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync falló al realizar la búsqueda del proxy</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync: Falló la autenticación con el servidor %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync: Falló la conexión con la red.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation>Se sobrepasó el tiempo de espera de la conexión de red.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Ha ocurrido un error de transmisión HTTP.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>CSync: Falló debido a un permiso denegado.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation>Error al acceder CSync</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>CSync trató de crear un directorio que ya existe.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: No queda espacio disponible en el servidor %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>Error no especificado de CSync</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Interrumpido por el usuario</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
-        <translation>El directorio en uso no está, temporalmente, disponible en el servidor</translation>
+        <translation>El directorio en uso no esta, temporalmente, disponible en el servidor</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation>Ha ocurrido un error interno número %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>El elemento no está sincronizado por errores previos: %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
-        <translation>No se admiten enlaces simbólicos en la sincronización.</translation>
+        <translation>Los enlaces simbolicos no estan sopertados.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation>Los enlaces duros no están permitidos en la sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation>El fichero está en la lista de ignorados</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation>El fichero contiene caracteres inválidos que no pueden ser sincronizados con la plataforma.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation>Los caracteres del nombre de fichero no son válidos</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>No se pudo inicializar un registro (journal) de sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation>No es posible abrir el diario de sincronización</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
-        <translation>Ignorado por que se encuentra en la lista negra de &quot;elija qué va a sincronizar&quot;</translation>
+        <translation>Ignorado por que se encuentra en la lista negra de &quot;elige que vas a sincronizar&quot;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
-        <translation>No está permitido porque no tiene permisos para añadir subcarpetas en este directorio.</translation>
+        <translation>No está permitido, porque no tiene permisos para añadir subcarpetas en este directorio.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>No está permitido porque no tiene permisos para añadir un directorio</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
-        <translation>No está permitido porque no tiene permisos para crear archivos en este directorio</translation>
+        <translation>No está permitido, porque no tiene permisos para crear archivos en este directorio</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>No está permitido subir este archivo porque es de solo lectura en el servidor, restaurando.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation>No está permitido borrar, restaurando.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation>Se eliminaron los archivos locales y la carpeta compartida.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation>No está permitido mover, elemento restaurado.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
-        <translation>No está permitido mover, porque %1 es de sólo lectura.</translation>
+        <translation>No está permitido mover, porque %1 es solo lectura.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation>destino</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation>origen</translation>
    </message>
@@ -2160,7 +2155,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/mirall/owncloudgui.cpp" line="228"/>
        <source>Please sign in</source>
-        <translation>Por favor, regístrese</translation>
+        <translation>Por favor Registrese</translation>
    </message>
    <message>
        <location filename="../src/mirall/owncloudgui.cpp" line="233"/>
@@ -2298,7 +2293,7 @@ No se recomienda usarla.</translation>
    <message utf8="true">
        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;br/&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&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, Olivier Goffart, Markus Götz y otros.&lt;br/&gt;Basado en Mirall por Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licenciado bajo la Licencia Pública General de GNU (GPL) Versión 2.0&lt;br/&gt;ownCloud y el logotipo ownCloud son marcas registradas de ownCloud, Inc. en los Estados Unidos, otros países o en ambos&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Version %2. Para mas informacion visite &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Por Klass Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz y otros.&lt;br/&gt;Basado en Mirall por Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensiado bajo el GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud y el logo ownCloud son marcas registradas de ownCloud, Inc. en los Estados Unidos, otros paises, o ambos.&lt;/p&gt;</translation>
    </message>
 </context>
 <context>
@@ -2477,7 +2472,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/wizard/owncloudsetupnocredspage.ui" line="157"/>
        <source>Error Label</source>
-        <translation>Etiqueta de error</translation>
+        <translation>Etiquetado de Error</translation>
    </message>
 </context>
 <context>
@@ -2537,12 +2532,12 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/main.cpp" line="38"/>
        <source>System Tray not available</source>
-        <translation>La bandeja del sistema no está disponible</translation>
+        <translation>Bandeja del sistema no está disponible</translation>
    </message>
    <message>
        <location filename="../src/main.cpp" line="39"/>
        <source>%1 requires on a working system tray. If you are running XFCE, please follow &lt;a href=&quot;http://docs.xfce.org/xfce/xfce4-panel/systray&quot;&gt;these instructions&lt;/a&gt;. Otherwise, please install a system tray application such as &apos;trayer&apos; and try again.</source>
-        <translation>% 1 requiere una bandeja del sistema de trabajo. Si está ejecutando XFCE, por favor siga &lt;a href=&quot;http://docs.xfce.org/xfce/xfce4-panel/systray&quot;&gt; estas instrucciones &lt;/ a&gt;. De lo contrario, instale una aplicación de la bandeja del sistema, tales como &apos;trayer&apos; y vuelva a intentarlo.</translation>
+        <translation>% 1 requiere en una bandeja del sistema de trabajo. Si está ejecutando XFCE, por favor siga &lt;a href=&quot;http://docs.xfce.org/xfce/xfce4-panel/systray&quot;&gt; estas instrucciones &lt;/ a&gt;. De lo contrario, instale una aplicación de la bandeja del sistema, tales como &quot;trayer &apos;y vuelva a intentarlo.</translation>
    </message>
 </context>
 <context>
@@ -2668,7 +2663,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/mirall/theme.cpp" line="72"/>
        <source>Preparing to sync</source>
-        <translation>Preparando para sincronizar</translation>
+        <translation>Preparando para la sincronizacipon</translation>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="75"/>
@@ -481,17 +481,17 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>Archivo</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>Sincronizando todos los archivos en tu cuenta con</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>Ruta Remota: %1</translation>
    </message>
@@ -1867,255 +1867,250 @@ It is not advisable to use it.</source>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>Éxito.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>Se registró un error en CSync cuando se intentaba crear un archivo de bloqueo.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;No fue posible cargar el plugin de %1 para csync.&lt;br/&gt;Por favor, verificá la instalación&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>La hora del sistema en este cliente es diferente de la hora del sistema en el servidor. Por favor, usá un servicio de sincronización (NTP) de hora en las máquinas cliente y servidor para que las horas se mantengan iguales.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>CSync no pudo detectar el tipo de sistema de archivos.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync tuvo un error mientras procesaba los árboles de datos internos.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync falló al reservar memoria.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>Error fatal de parámetro en CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>Falló el proceso de actualización de CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>Falló el proceso de composición de CSync</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>Proceso de propagación de CSync falló</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;El directorio de destino %1 no existe.&lt;/p&gt; Por favor, comprobá la configuración de sincronización. &lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>No se puede escribir un archivo remoto. Revisá el acceso remoto.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>No se puede escribir en el sistema de archivos local. Revisá los permisos.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSync falló al tratar de conectarse a través de un proxy</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync no pudo autenticar el proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync falló al realizar la busqueda del proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync: fallo al autenticarse en el servidor %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync: fallo al conectarse a la red</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Ha ocurrido un error de transmisión HTTP.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>CSync: Falló debido a un permiso denegado.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation>CSync falló al acceder</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>Csync trató de crear un directorio que ya existía.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: No hay más espacio disponible en el servidor %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>Error no especificado de CSync</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Interrumpido por el usuario</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Los vínculos simbólicos no está soportados al sincronizar.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation>El archivo está en la lista de ignorados.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation>El archivo contiene caracteres inválidos que no pueden ser sincronizados entre plataforma.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Imposible inicializar un diario de sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation type="unfinished"/>
    </message>
@@ -482,17 +482,17 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>Fail</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>Sünkroniseeritakse sinu konto kõik failid</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>Eemalda asukoht: %1</translation>
    </message>
@@ -1875,255 +1875,250 @@ Selle kasutamine pole soovitatav.</translation>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>Korras.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>CSync lukustusfaili loomine ebaõnnestus.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation>Csync ei suutnud avada või luua registri faili.  Tee kindlaks et sul on õigus lugeda ja kirjutada kohalikus sünkrooniseerimise kataloogis</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation>CSync ei suutnud luua registri faili.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;Ei suuda laadida csync lisa %1.&lt;br/&gt;Palun kontrolli paigaldust!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>Kliendi arvuti kellaeg erineb serveri omast. Palun kasuta õige aja hoidmiseks kella sünkroniseerimise teenust (NTP) nii serveris kui kliendi arvutites, et kell oleks kõikjal õige.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>CSync ei suutnud tuvastada failisüsteemi tüüpi.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync sai vea sisemiste andmestruktuuride töötlemisel.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync ei suutnud mälu reserveerida.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>CSync parameetri saatuslik viga.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>CSync uuendusprotsess ebaõnnestus.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSync tasakaalustuse protsess ebaõnnestus.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>CSync edasikandeprotsess ebaõnnestus.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Sihtkataloogi ei eksisteeri.&lt;/p&gt;&lt;p&gt;Palun kontrolli sünkroniseeringu seadistust&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>Eemalolevasse faili ei saa kirjutada. Palun kontrolli kaugühenduse ligipääsu.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>Kohalikku failissüsteemi ei saa kirjutada. Palun kontrolli õiguseid.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSync ühendus läbi puhverserveri ebaõnnestus.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync ei suutnud puhverserveris autoriseerida.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>Csync ei suuda leida puhverserverit.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync autoriseering serveris %1 ebaõnnestus.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync võrguga ühendumine ebaõnnestus.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation>Toimus võrgukatkestus.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>HTTP ülekande viga.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>CSync ebaõnnestus ligipääsu puudumisel.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation>CSyncile ligipääs ebaõnnestus</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>Csync proovis tekitada kataloogi, mis oli juba olemas.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Serveris %1 on ruum otsas.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>CSync tuvastamatu viga.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Kasutaja poolt tühistatud</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation>Ühendatud kataloog ei ole ajutiselt serverist kättesaadav.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation>Tekkis sisemine viga number %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Üksust ei sünkroniseeritud eelnenud vigade tõttu: %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Sümboolsed lingid ei ole sünkroniseerimisel toetatud.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation>Jäigad lingid ei ole sünkroniseerimisel toetatud.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation>Fail on märgitud ignoreeritavate nimistus.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation>Fail sisaldab sobimatuid sümboleid, mida ei saa sünkroniseerida erinevate platvormide vahel.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Ei suuda lähtestada sünkroniseeringu zurnaali.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation>Ei suuda avada sünkroniseeringu zurnaali</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>&quot;Vali, mida sünkroniseerida&quot; musta nimekirja tõttu vahele jäetud</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Pole lubatud, kuna sul puuduvad õigused lisada sellesse kataloogi lisada alam-kataloogi</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Pole lubatud, kuna sul puuduvad õigused lisada ülemkataloog</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Pole lubatud, kuna sul puuduvad õigused sellesse kataloogi faile lisada</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Pole lubatud üles laadida, kuna tegemist on ainult-loetava serveriga, taastan</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Eemaldamine pole lubatud, taastan</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation>Kohalikud failid ja jagatud kaustad eemaldatud.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation>Liigutamine pole lubatud, üksus taastatud</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Liigutamien pole võimalik kuna %1 on ainult lugemiseks</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation>sihtkoht</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation>allikas</translation>
    </message>
@@ -482,17 +482,17 @@ Ziur zaude eragiketa hau egin nahi duzula?</translation>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>Fitxategia</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>Fitxategi guztiak sinkronizatzen zure kontuan honekin</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>Urruneko bidea: %1</translation>
    </message>
@@ -1870,255 +1870,250 @@ Ez da gomendagarria erabltzea.</translation>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>Arrakasta.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>CSyncek huts egin du lock fitxategia sortzean.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;csyncen %1 plugina ezin da kargatu.&lt;br/&gt;Mesedez egiaztatu instalazioa!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>Bezero honetako sistemaren ordua zerbitzariarenaren ezberdina da. Mesedez erabili sinkronizazio zerbitzari bat (NTP) zerbitzari eta bezeroan orduak berdinak izan daitezen.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>CSyncek ezin du fitxategi sistema mota antzeman.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSyncek errorea izan du barne zuhaitzak prozesatzerakoan.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSyncek huts egin du memoria alokatzean.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>CSync parametro larri errorea.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>CSync prozesatzearen eguneratu urratsak huts egin du.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSync prozesatzearen berdinkatze urratsak huts egin du.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>CSync prozesatzearen hedatu urratsak huts egin du.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Helburu direktorioa ez da existitzen.&lt;/p&gt;&lt;p&gt;Egiazt6atu sinkronizazio konfigurazioa.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>Urruneko fitxategi bat ezin da idatzi. Mesedez egiaztatu urreneko sarbidea.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>Ezin da idatzi bertako fitxategi sisteman. Mesedez egiaztatu baimenak.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSyncek huts egin du proxiaren bidez konektatzean.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSyncek ezin izan du proxya autentikatu.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSyncek huts egin du zerbitzaria edo proxia bilatzean.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSyncek huts egin du %1 zerbitzarian autentikatzean.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSyncek sarera konektatzean huts egin du.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>HTTP transmisio errore bat gertatu da.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>CSyncek huts egin du kudeatu gabeko baimen ukapen bat dela eta.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>CSyncek dagoeneko existitzen zen karpeta bat sortzen saiatu da.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Ez dago lekurik %1 zerbitzarian.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>CSyncen zehaztugabeko errorea.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Erabiltzaileak bertan behera utzita</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Esteka sinbolikoak ezin dira sinkronizatu.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation>Fitxategia baztertutakoen zerrendan dago.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Ezin izan da sinkronizazio egunerokoa hasieratu.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Ezabatzeko baimenik gabe, berrezartzen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation>Mugitzea ez dago baimenduta, elementua berrezarri da</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Mugitzea ez dago baimenduta %1 irakurtzeko bakarrik delako</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation>helburua</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation>jatorria</translation>
    </message>
@@ -479,17 +479,17 @@ Are you sure you want to perform this operation?</source>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>فایل</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation type="unfinished"/>
    </message>
@@ -1863,255 +1863,250 @@ It is not advisable to use it.</source>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>موفقیت</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>CSync موفق به ایجاد یک فایل قفل شده، نشد.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;ماژول %1 برای csync نمی تواند بارگذاری شود.&lt;br/&gt;لطفا نصب را بررسی کنید!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>سیستم زمان بر روی این مشتری با سیستم زمان بر روی سرور متفاوت است.لطفا از خدمات هماهنگ سازی زمان (NTP) بر روی ماشین های سرور و کلاینت استفاده کنید تا زمان ها یکسان باقی بمانند.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>CSync  نوع فایل های سیستم را نتوانست تشخیص بدهد.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync هنگام پردازش درختان داخلی یک خطا دریافت نمود.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync موفق به رزرو حافظه نشد است.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>مرحله به روز روسانی پردازش CSync ناموفق بود.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>مرحله تطبیق پردازش CSync ناموفق بود.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>مرحله گسترش پردازش CSync ناموفق بود.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;پوشه هدف وجود ندارد.&lt;/p&gt;&lt;p&gt;لطفا راه اندازی همگام سازی را بررسی کنید.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>یک فایل از راه دور نمی تواند نوشته شود. لطفا دسترسی از راه دور را بررسی نمایید.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>بر روی فایل سیستمی محلی نمی توانید چیزی بنویسید.لطفا مجوزش را بررسی کنید.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>عدم موفقیت CSync  برای اتصال از طریق یک پروکسی.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>عدم موفقیت CSync  برای مراجعه به پروکسی یا سرور.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>عدم موفقیت CSync  برای اعتبار دادن در %1 سرور.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>عدم موفقیت CSync برای اتصال به شبکه.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>خطا در انتقال HTTP اتفاق افتاده است.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>CSync برای ایجاد یک پوشه که در حال حاضر موجود است تلاش کرده است.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: فضا در %1 سرور در دسترس نیست.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>خطای نامشخص CSync </translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation type="unfinished"/>
    </message>
@@ -480,17 +480,17 @@ Are you sure you want to perform this operation?</source>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>Tiedosto</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>Synkronoidaan kaikki tilisi tiedostot polkuun</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>Etäpolku: %1</translation>
    </message>
@@ -1110,7 +1110,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="153"/>
        <source>&amp;Next &gt;</source>
-        <translation>&amp;Seuraava &gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="233"/>
@@ -1872,255 +1872,250 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>Onnistui.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>Csync ei onnistunut luomaan lukitustiedostoa.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;%1-liitännäistä csyncia varten ei voitu ladata.&lt;br/&gt;Varmista asennuksen toimivuus!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>Tämän koneen järjestelmäaika on erilainen verrattuna palvelimen aikaan. Käytä NTP-palvelua kummallakin koneella, jotta kellot pysyvät samassa ajassa. Muuten tiedostojen synkronointi ei toimi.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>Csync-synkronointipalvelu ei kyennyt tunnistamaan tiedostojärjestelmän tyyppiä.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>Csync-synkronointipalvelussa tapahtui virhe sisäisten puurakenteiden prosessoinnissa.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync ei onnistunut varaamaan muistia.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Kohdekansiota ei ole olemassa.&lt;/p&gt;&lt;p&gt;Tarkasta synkronointiasetuksesi.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>Etätiedostoa ei pystytä kirjoittamaan. Tarkista, että etäpääsy toimii.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>Paikalliseen tiedostojärjestelmään kirjoittaminen epäonnistui. Tarkista kansion oikeudet.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSync ei onnistunut muodostamaan yhteyttä välityspalvelimen välityksellä.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync ei onnistunut yhdistämään verkkoon.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation>Tapahtui verkon aikakatkaisu.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Tapahtui HTTP-välitysvirhe.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>CSync yritti luoda olemassa olevan kansion.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: %1-palvelimella ei ole tilaa vapaana.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>CSync - määrittämätön virhe.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Keskeytetty käyttäjän toimesta</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation>Ilmeni sisäinen virhe, jonka numero on %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Kohdetta ei synkronoitu aiempien virheiden vuoksi: %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Symboliset linkit eivät ole tuettuja synkronoinnissa.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation>Tiedosto sisältää virheellisiä merkkejä, joiden vuoksi sitä voi synkronoida eri käyttöjärjestelmien välillä.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation>Tiedostonimen merkistökoodaus ei ole kelvollista</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Ei sallittu, koska sinulla ei ole oikeutta lisätä tiedostoja kyseiseen kansioon</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Poistaminen ei ole sallittua, palautetaan</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation>Paikalliset tiedostot ja jakokansio poistettu.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation>Siirtäminen ei ole sallittua, kohde palautettu</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Siirto ei ole sallittu, koska %1 on &quot;vain luku&quot;-tilassa</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation>kohde</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation>lähde</translation>
    </message>
@@ -85,7 +85,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.ui" line="41"/>
        <source>Connected with &lt;server&gt; as &lt;user&gt;</source>
-        <translation>Connecté à &lt;server&gt; en tant que &lt;user&gt;</translation>
+        <translation>Connecté avec &lt;server&gt; en tant que &lt;user&gt;</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.ui" line="62"/>
@@ -141,7 +141,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="375"/>
        <source>Confirm Folder Reset</source>
-        <translation>Confirmez la réinitialisation du dossier</translation>
+        <translation>Confirmation de la réinitialisation du dossier</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="376"/>
@@ -193,7 +193,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="487"/>
        <source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
-        <translation>La synchronisation est en cours.&lt;br/&gt;Voulez-vous l&apos;arrêter ?</translation>
+        <translation>La synchronisation est en cours.&lt;br/&gt;Voulez-vous y mettre un terme?</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="607"/>
@@ -204,7 +204,7 @@
        <location filename="../src/mirall/accountsettings.cpp" line="647"/>
        <source>%1 %2 (%3 of %4) %5 left at a rate of %6/s</source>
        <extracomment>Example text: &quot;uploading foobar.png (1MB of 2MB) time left 2 minutes at a rate of 24Kb/s&quot;</extracomment>
-        <translation>%1 %2 (%3 sur %4) %5 restante(s) à un débit de %6/s</translation>
+        <translation>%1 %2 (%3 de %4) %5 restant à un débit de %6/s</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="672"/>
@@ -482,17 +482,17 @@ Voulez-vous réellement effectuer cette opération ?</translation>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>Fichier</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>Configuré pour synchroniser tous vos fichiers dans</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>Chemin distant : %1</translation>
    </message>
@@ -546,12 +546,12 @@ Voulez-vous réellement effectuer cette opération ?</translation>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="141"/>
        <source>The selected folder is a symbolic link. An already configured folder is contained in the folder this link is pointing to.</source>
-        <translation>Le dossier sélectionné est un lien symbolique. Un dossier configuré existe déjà dans le répertoire vers lequel le lien pointe.</translation>
+        <translation>Le dossier sélectionné est un lien symbolique. Une configuration du dossier existe déjà dans le dossier portant vers ce même lien.</translation>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="148"/>
        <source>An already configured folder contains the currently entered folder.</source>
-        <translation>Le dossier saisi est contenu dans un dossier déjà configuré.</translation>
+        <translation>Le dossier saisi est déjà contenu dans un dossier configuré.</translation>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="154"/>
@@ -753,7 +753,7 @@ Les items cochés seront également supprimés s&apos;ils empêchent la suppress
    <message>
        <location filename="../src/mirall/ignorelisteditor.cpp" line="105"/>
        <source>Add Ignore Pattern</source>
-        <translation>Ajouter un motif à ignorer</translation>
+        <translation>Ajouter un modèle à ignorer</translation>
    </message>
    <message>
        <location filename="../src/mirall/ignorelisteditor.cpp" line="106"/>
@@ -839,7 +839,7 @@ Les items cochés seront également supprimés s&apos;ils empêchent la suppress
    <message>
        <location filename="../src/mirall/logger.cpp" line="149"/>
        <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 le fichier de log !&lt;/nobr&gt;</translation>
+        <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>
 </context>
 <context>
@@ -1114,7 +1114,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="153"/>
        <source>&amp;Next &gt;</source>
-        <translation>&amp;Suivant &gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="233"/>
@@ -1241,7 +1241,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
    <message>
        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="355"/>
        <source>Successfully connected to %1!</source>
-        <translation>Connecté avec succès à %1 !</translation>
+        <translation>Connecté avec succès à %1!</translation>
    </message>
    <message>
        <location filename="../src/mirall/owncloudsetupwizard.cpp" line="362"/>
@@ -1875,255 +1875,250 @@ Il est déconseillé de l&apos;utiliser.</translation>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>Succès.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>CSync n&apos;a pas pu créer le fichier de verrouillage.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation>CSync n’a pu charger ou créer le fichier de journalisation. Veuillez vérifier que vous possédez les droits en lecture/écriture dans le répertoire de synchronisation local.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation>CSync n’a pu écrire le fichier de journalisation.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Le module additionnel %1 pour csync n&apos;a pas pu être chargé.&lt;br/&gt;Merci de vérifier votre installation !&lt;/p&gt;</translation>
+        <translation>&lt;p&gt;Le plugin %1 pour csync n&apos;a pas pu être chargé.&lt;br/&gt;Merci de vérifier votre installation !&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>L&apos;heure du client est différente de l&apos;heure du serveur. Veuillez utiliser un service de synchronisation du temps (NTP) sur le serveur et le client afin que les horloges soient à la même heure.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>CSync n&apos;a pas pu détecter le type de système de fichiers.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>Erreur CSync lors du traitement des arbres internes.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>Erreur lors de l&apos;allocation mémoire par CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>Erreur fatale CSync : mauvais paramètre.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>Erreur CSync lors de l&apos;opération de mise à jour</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>Erreur CSync lors de l&apos;opération d&apos;harmonisation</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>Erreur CSync lors de l&apos;opération de propagation</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Le répertoire cible n&apos;existe pas.&lt;/p&gt;&lt;p&gt;Veuillez vérifier la configuration de la synchronisation.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>Un fichier distant ne peut être écrit. Veuillez vérifier l’accès distant.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>Le système de fichiers local n&apos;est pas accessible en écriture. Veuillez vérifier les permissions.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSync n&apos;a pu établir une connexion à travers un proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync ne peut s&apos;authentifier auprès du proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync n&apos;a pu trouver un proxy ou serveur auquel se connecter.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync n&apos;a pu s&apos;authentifier auprès du serveur %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync n&apos;a pu établir une connexion au réseau.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation>Le délai d&apos;attente pour la connexion réseau a été dépassé.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Une erreur de transmission HTTP s&apos;est produite.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <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>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation>Echec de CSync pour accéder</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <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>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync : Aucun espace disponible sur le serveur %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>Erreur CSync inconnue.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Interrompu par l&apos;utilisateur</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation>Le dossier monté est temporairement indisponible sur le serveur</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation>Une erreur interne numéro %1 s&apos;est produite.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Cet élément n&apos;a pas été synchronisé en raison des erreurs précédentes : %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Les liens symboliques ne sont pas pris en charge par la synchronisation.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation>Les liens durs (hard links) ne sont pas pris en charge par la synchronisation.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation>Le fichier est dans la liste des fichiers à ignorer.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation>Le fichier contient des caractères non valides qui ne peuvent être synchronisés entre plate-formes.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation>L&apos;encodage du nom de fichier n&apos;est pas valide</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Impossible d&apos;initialiser un journal de synchronisation.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation>Impossible d&apos;ouvrir le journal de synchronisation</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignoré à cause de la liste noire du contenu à synchroniser.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Non autorisé car vous n&apos;avez pas la permission d&apos;ajouter des sous-dossiers dans ce dossier</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Non autorisé car vous n&apos;avez pas la permission d&apos;ajouter des dossiers parents</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Non autorisé car vous n&apos;avez pas la permission d&apos;ajouter des fichiers dans ce dossier</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Non autorisé à envoyer ce fichier car il est en lecture seule sur le serveur. Restauration</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Non autorisé à supprimer. Restauration</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation>Fichiers locaux et répertoire de partage supprimés.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation>Déplacement non autorisé, élément restauré</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Déplacement non autorisé car %1 est en mode lecture seule</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation>la destination</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation>la source</translation>
    </message>
@@ -2146,12 +2141,12 @@ Il est déconseillé de l&apos;utiliser.</translation>
    <message>
        <location filename="../src/mirall/theme.cpp" line="238"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorparated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="239"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Distribué par %1 et sous licence GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 et le logo %2  sont des marques enregistrées de %1 aux Etats-Unis, dans d&apos;autres pays, ou les deux.&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -37,7 +37,7 @@
    <message>
        <location filename="../src/mirall/folderwizardtargetpage.ui" line="140"/>
        <source>Create Folder</source>
-        <translation>Crear un cartafol</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/folderwizardtargetpage.ui" line="160"/>
@@ -482,17 +482,17 @@ Confirma que quere realizar esta operación?</translation>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>Ficheiro</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>Sincronizando todos os ficheiros na súa conta con</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>Ruta remota: %1</translation>
    </message>
@@ -579,12 +579,12 @@ Confirma que quere realizar esta operación?</translation>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="257"/>
        <source>Create Remote Folder</source>
-        <translation>Crear un cartafol remoto</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="258"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
-        <translation>Introduza o nome do novo cartafol que se creará a seguir «%1»:</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="287"/>
@@ -1114,7 +1114,7 @@ Recomendámoslle que non o use.</translation>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="153"/>
        <source>&amp;Next &gt;</source>
-        <translation>&amp;Seguinte &gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="233"/>
@@ -1876,255 +1876,250 @@ Recomendámoslle que non o use.</translation>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>Correcto.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>Produciuse un fallo en CSync ao crear un ficheiro de bloqueo.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation>Produciuse un fallo do Csync ao cargar ou crear o ficheiro de rexistro. Asegúrese de que ten permisos de lectura e escritura no directorio de sincronización local.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation>Produciuse un fallo en CSync ao escribir o ficheiro de rexistro.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;Non foi posíbel cargar o engadido %1 para CSync.&lt;br/&gt;Verifique a instalación!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>A diferenza de tempo neste cliente e diferente do tempo do sistema no servidor. Use o servido de sincronización de tempo (NTP) no servidor e nas máquinas cliente para que os tempos se manteñan iguais.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>CSync non pode detectar o tipo de sistema de ficheiros.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync tivo un erro ao procesar árbores internas.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>Produciuse un fallo ao reservar memoria para CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>Produciuse un erro fatal de parámetro CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>Produciuse un fallo ao procesar o paso de actualización de CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>Produciuse un fallo ao procesar o paso de reconciliación de CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>Produciuse un fallo ao procesar o paso de propagación de CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Non existe o directorio de destino.&lt;/p&gt;&lt;p&gt;Comprobe a configuración da sincronización.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>Non é posíbel escribir un ficheiro remoto. Comprobe o acceso remoto.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>Non é posíbel escribir no sistema de ficheiros local. Comprobe os permisos.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSYNC no puido conectarse a través dun proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync non puido autenticarse no proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSYNC no puido atopar o servidor proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync non puido autenticarse no servidor %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSYNC no puido conectarse á rede.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation>Excedeuse do tempo de espera para a conexión á rede.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Produciuse un erro na transmisión HTTP.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>Produciuse un fallo en CSync por mor dun permiso denegado.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation>Produciuse un fallo ao acceder a CSync</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>CSYNC tenta crear un directorio que xa existe.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Non hai espazo dispoñíbel no servidor %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>Produciuse un erro non especificado de CSync</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Interrompido polo usuario</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation>O directorio montado non está temporalmente dispoñible no servidor</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation>Produciuse un erro interno número %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Este elemento non foi sincronizado por mor de erros anteriores: %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>As ligazóns simbolicas non son admitidas nas sincronizacións</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation>As ligazóns duras non son admitidas nas sincronizacións</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation>O ficheiro está na lista de ignorados.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation>O ficheiro conten caracteres incorrectos que non poden sincronizarse entre distintas plataformas.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation>O nome de ficheiro codificado non é correcto</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Non é posíbel iniciar un rexistro de sincronización.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation>Non foi posíbel abrir o rexistro de sincronización</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorado debido a lista negra de &quot;escolla qué sincronizar&quot;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Non está permitido xa que non ten permiso para engadir subdirectorios nese directorio</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Non está permitido xa que non ten permiso para engadir un directorio pai</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Non está permitido xa que non ten permiso para engadir ficheiros nese directorio</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Non está permitido o envío xa que o ficheiro é só de lectura no servidor, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Non está permitido retiralo, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation>Ficheiros locáis e cartafol compartido eliminados.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation>Nos está permitido movelo, elemento restaurado</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Bon está permitido movelo xa que %1 é só de lectura</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation>o destino</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation>a orixe</translation>
    </message>
@@ -2142,17 +2137,17 @@ Recomendámoslle que non o use.</translation>
    <message>
        <location filename="../src/mirall/theme.cpp" line="234"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Versión %1. Para obter máis información visite &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="238"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorparated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Copyright ownCloud, Incorparated&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="239"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Distribuído por %1 e licenciado baixo a Licenza Pública Xeral (GPL) GNU Versión 2.0.&lt;br/&gt;Os logotipos %2 e %2 son marcas rexistradas de %1 nos Estados Unidos de Norte América e/ou outros países.&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -37,7 +37,7 @@
    <message>
        <location filename="../src/mirall/folderwizardtargetpage.ui" line="140"/>
        <source>Create Folder</source>
-        <translation>Mappa létrhozása</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/folderwizardtargetpage.ui" line="160"/>
@@ -101,12 +101,12 @@
    <message>
        <location filename="../src/mirall/accountsettings.ui" line="55"/>
        <source>Add Folder...</source>
-        <translation>Mappa lètrehozása...</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.ui" line="76"/>
        <source>Choose What to Sync</source>
-        <translation>Szinkronizálandó elemek kiválasztása</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.ui" line="101"/>
@@ -141,7 +141,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="375"/>
        <source>Confirm Folder Reset</source>
-        <translation>Mappa visszaállítás megerősítése</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="376"/>
@@ -198,7 +198,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="607"/>
        <source>Discovering &apos;%1&apos;</source>
-        <translation>&apos;%1&apos; felderítése</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="647"/>
@@ -479,17 +479,17 @@ Are you sure you want to perform this operation?</source>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>Fájl</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>Távoli elérési út: %1</translation>
    </message>
@@ -664,7 +664,7 @@ Are you sure you want to perform this operation?</source>
    <message>
        <location filename="../src/mirall/generalsettings.ui" line="20"/>
        <source>General Settings</source>
-        <translation>Általános beállítások</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/generalsettings.ui" line="26"/>
@@ -1553,7 +1553,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/mirall/selectivesyncdialog.cpp" line="271"/>
        <source>Choose What to Sync</source>
-        <translation>Szinkronizálandó elemek kiválasztása</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/selectivesyncdialog.cpp" line="274"/>
@@ -1863,255 +1863,250 @@ It is not advisable to use it.</source>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>Sikerült.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>A CSync nem tudott létrehozni lock fájlt.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;Az %1 beépülőmodul a csync-hez nem tölthető be.&lt;br/&gt;Ellenőrizze a telepítést!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>A helyi rendszeridő különbözik a kiszolgáló rendszeridejétől. Használjon időszinkronizációs szolgáltatást (NTP) a rendszerén és a szerveren is, hogy az idő mindig megeggyezzen.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>A CSync nem tudta megállapítani a fájlrendszer típusát.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>A CSync hibába ütközött a belső adatok feldolgozása közben.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>Hiba a CSync memórifoglalásakor.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>CSync hibás paraméterhiba.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>CSync frissítés feldolgozása meghíusult.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSync egyeztetési lépés meghíusult.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>CSync propagálási lépés meghíusult.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;A célmappa nem létezik.&lt;/p&gt;&lt;p&gt;Ellenőrizze a sync beállításait.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>Egy távoli fájl nem írható. Kérlek, ellenőrizd a távoli elérést.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>A helyi fájlrendszer nem írható. Kérlek, ellenőrizd az engedélyeket.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSync proxy kapcsolódási hiba.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>A CSync nem találja a proxy kiszolgálót.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>A CSync nem tuja azonosítani magát a %1 kiszolgálón.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync hálózati kapcsolódási hiba.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>HTTP átviteli hiba történt.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>CSync hiba, nincs kezelési jogosultság.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <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>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Nincs szabad tárhely az %1 kiszolgálón.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>CSync ismeretlen hiba.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation type="unfinished"/>
    </message>
@@ -2257,7 +2252,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/mirall/owncloudgui.cpp" line="471"/>
        <source>Discovering &apos;%1&apos;</source>
-        <translation>&apos;%1&apos; felderítése</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/owncloudgui.cpp" line="476"/>
@@ -482,17 +482,17 @@ Sei sicuro di voler eseguire questa operazione?</translation>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>File</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>Sincronizza tutti i file nel tuo account con</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>Percorso remoto: %1</translation>
    </message>
@@ -672,7 +672,7 @@ Sei sicuro di voler eseguire questa operazione?</translation>
    <message>
        <location filename="../src/mirall/generalsettings.ui" line="26"/>
        <source>Launch on System Startup</source>
-        <translation>Esegui all&apos;avvio del sistema</translation>
+        <translation>Lancia all&apos;avvio del sistema</translation>
    </message>
    <message>
        <location filename="../src/mirall/generalsettings.ui" line="33"/>
@@ -1113,7 +1113,7 @@ Non è consigliabile utilizzarlo.</translation>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="153"/>
        <source>&amp;Next &gt;</source>
-        <translation>Ava&amp;nti &gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="233"/>
@@ -1875,255 +1875,250 @@ Non è consigliabile utilizzarlo.</translation>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>Successo.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>CSync non è riuscito a creare il file di lock.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation>CSync non è riuscito a caricare o a creare il file di registro. Assicurati di avere i permessi di lettura e scrittura nella cartella di sincronizzazione locale.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation>CSync non è riuscito a scrivere il file di registro.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;Il plugin %1 per csync non può essere caricato.&lt;br/&gt;Verifica l&apos;installazione!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>L&apos;ora di sistema su questo client è diversa dall&apos;ora di sistema del server. Usa un servizio di sincronizzazione dell&apos;orario (NTP) sul server e sulle macchine client in modo che l&apos;ora sia la stessa.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>CSync non è riuscito a individuare il tipo di filesystem.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>Errore di CSync durante l&apos;elaborazione degli alberi interni.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync non è riuscito a riservare la memoria.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>Errore grave di parametro di CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>La fase di aggiornamento di CSync non è riuscita.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>La fase di riconciliazione di CSync non è riuscita.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>La fase di propagazione di CSync non è riuscita.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;La cartella di destinazione non esiste.&lt;/p&gt;&lt;p&gt;Controlla la configurazione della sincronizzazione.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>Un file remoto non può essere scritto. Controlla l&apos;accesso remoto.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>Il filesystem locale non può essere scritto. Controlla i permessi.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSync non è riuscito a connettersi tramite un proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync non è in grado di autenticarsi al proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync non è riuscito a trovare un proxy o server.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync non è riuscito ad autenticarsi al server %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync non è riuscito a connettersi alla rete.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation>Si è verificato un timeout della connessione di rete.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Si è verificato un errore di trasmissione HTTP.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>Problema di CSync dovuto alla mancata gestione dei permessi.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation>CSync non è riuscito ad accedere</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>CSync ha cercato di creare una cartella già esistente.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: spazio insufficiente sul server %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>Errore non specificato di CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Interrotto dall&apos;utente</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation>La cartella montata è temporaneamente indisponibile sul server</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation>SI è verificato un errore interno numero %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>L&apos;elemento non è sincronizzato a causa dell&apos;errore precedente: %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>I collegamenti simbolici non sono supportati dalla sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation>Gli hard link non sono supportati dalla sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation>Il file è stato aggiunto alla lista ignorati.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation>Il file contiene caratteri non validi che non possono essere sincronizzati su diverse piattaforme.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation>La codifica del nome del file non è valida</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Impossibile inizializzare il registro di sincronizzazione.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation>Impossibile aprire il registro di sincronizzazione</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorato in base alla lista nera per la scelta di cosa sincronizzare</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Non consentito poiché non disponi dei permessi per aggiungere sottocartelle in quella cartella</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Non consentito poiché non disponi dei permessi per aggiungere la cartella superiore</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Non consentito poiché non disponi dei permessi per aggiungere file in quella cartella</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Il caricamento di questo file non è consentito poiché è in sola lettura sul server, ripristino</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Rimozione non consentita, ripristino</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation>I file locali e la cartella condivisa sono stati rimossi.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation>Spostamento non consentito, elemento ripristinato</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Spostamento non consentito poiché %1 è in sola lettura</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation>la destinazione</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation>l&apos;origine</translation>
    </message>
@@ -37,7 +37,7 @@
    <message>
        <location filename="../src/mirall/folderwizardtargetpage.ui" line="140"/>
        <source>Create Folder</source>
-        <translation>フォルダーを作成</translation>
+        <translation>フォルダを作成</translation>
    </message>
    <message>
        <location filename="../src/mirall/folderwizardtargetpage.ui" line="160"/>
@@ -210,7 +210,7 @@
        <location filename="../src/mirall/accountsettings.cpp" line="672"/>
        <source>%1 of %2, file %3 of %4
 Total time left %5</source>
-        <translation>%2 のうち %1 , ファイル%4個のうち%3個
+        <translation>%2 のうち %1 , ファイル %4 のうち %3
 残り時間 %5</translation>
    </message>
    <message>
@@ -367,7 +367,7 @@ Total time left %5</source>
    <message>
        <location filename="../src/mirall/folder.cpp" line="485"/>
        <source>%1 has been moved to %2.</source>
-        <translation>%1 は %2 に移動しました。</translation>
+        <translation>%1 は %2 に移されました。</translation>
    </message>
    <message>
        <location filename="../src/mirall/folder.cpp" line="490"/>
@@ -482,17 +482,17 @@ Are you sure you want to perform this operation?</source>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>ファイル</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>アカウントのすべてのファイルは同期済み</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>リモートパス: %1</translation>
    </message>
@@ -579,12 +579,12 @@ Are you sure you want to perform this operation?</source>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="257"/>
        <source>Create Remote Folder</source>
-        <translation>リモートフォルダーを追加</translation>
+        <translation>リモートフォルダを追加</translation>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="258"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
-        <translation> &apos;%1&apos;の下に新しいフォルダーの名前を入力:</translation>
+        <translation> &apos;%1&apos;の下に新しいフォルダの名前を入力:</translation>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="287"/>
@@ -622,7 +622,7 @@ Are you sure you want to perform this operation?</source>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="443"/>
        <source>Choose What to Sync: You can optionally deselect subfolders you do not wish to synchronize.</source>
-        <translation>何を同期するか選択: 同期したくないサブフォルダーは、同期対象から外せます。</translation>
+        <translation>何を同期するか選択: 同期したくないサブフォルダは、同期対象から外せます。</translation>
    </message>
 </context>
 <context>
@@ -1112,7 +1112,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="153"/>
        <source>&amp;Next &gt;</source>
-        <translation>次(&amp;N) &gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="233"/>
@@ -1448,7 +1448,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/mirall/propagator_qnam.cpp" line="327"/>
        <source>The local file was removed during sync.</source>
-        <translation>ローカルファイルを同期中に削除します。</translation>
+        <translation>ローカルファイルを同期時に削除します。</translation>
    </message>
    <message>
        <location filename="../src/mirall/propagator_qnam.cpp" line="130"/>
@@ -1876,255 +1876,250 @@ It is not advisable to use it.</source>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>成功。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>CSyncがロックファイルの作成に失敗しました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation>CSyncはジャーナルファイルの読み込みや作成に失敗しました。ローカルの同期ディレクトリに読み書きの権限があるか確認してください。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation>CSyncはジャーナルファイルの書き込みに失敗しました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;csync 用の %1 プラグインをロードできませんでした。&lt;br/&gt;インストール状態を確認してください！&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>このクライアントのシステム時刻はサーバーのシステム時刻と異なります。時刻が同じになるように、クライアントとサーバーの両方で時刻同期サービス(NTP)を実行してください。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>CSyncはファイルシステムタイプを検出できませんでした。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSyncは内部ツリーの処理中にエラーに遭遇しました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSyncで使用するメモリの確保に失敗しました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>CSyncの致命的なパラメータエラーです。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>CSyncの処理ステップの更新に失敗しました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSyncの処理ステップの調停に失敗しました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>CSyncの処理ステップの伝播に失敗しました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;ターゲットディレクトリは存在しません。&lt;/p&gt;&lt;p&gt;同期設定を確認してください。&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>リモートファイルは書き込みできません。リモートアクセスをチェックしてください。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>ローカルファイルシステムは書き込みができません。パーミッションをチェックしてください。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSyncがプロキシ経由での接続に失敗しました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSyncはそのプロキシで認証できませんでした。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSyncはプロキシもしくはサーバーの参照に失敗しました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSyncは %1 サーバーでの認証に失敗しました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSyncはネットワークへの接続に失敗しました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation>ネットワーク接続のタイムアウトが発生しました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>HTTPの伝送エラーが発生しました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>CSyncは対応できないパーミッション拒否が原因で失敗しました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation>CSync はアクセスに失敗しました</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>CSyncはすでに存在するディレクトリを作成しようとしました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: %1 サーバーには利用可能な空き領域がありません。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>CSyncの未指定のエラーです。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>ユーザーによって中止されました</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
-        <translation>サーバーでは、マウント済ディレクトリが一時的に利用できません。</translation>
+        <translation>マウントしたディレクトリはサーバー上では一時的に利用出来ません。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation>内部エラー番号 %1 が発生しました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>このアイテムは以前にエラーが発生したため同期しません: %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>同期機能は、シンボリックリンクをサポートしていません。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation>同期機能は、ハードリンクをサポートしていません。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation>ファイルは除外リストに登録されています。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation>ファイルに無効な文字が含まれているため、クロスプラットフォーム環境での同期ができません。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation>ファイル名のエンコーディングが無効です。</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>同期ジャーナルの初期化ができません。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation>同期ジャーナルを開くことができません</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>&quot;同期対象先&quot; ブラックリストにより無視されました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>そのディレクトリにサブディレクトリを追加する権限がありません</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>親ディレクトリを追加する権限がありません</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>そのディレクトリにファイルを追加する権限がありません</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>サーバーでは読み取り専用となっているため、このファイルをアップロードすることはできません、復元しています</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
-        <translation>削除できないので復元しています</translation>
+        <translation>削除できません、復元しています</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
-        <translation>ローカルファイルと共有フォルダーを削除しました。</translation>
+        <translation>ローカルファイルと共有フォルダが削除されました。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
-        <translation>移動できないので項目を復元しました</translation>
+        <translation>移動できません、項目を復元しました</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>%1 は読み取り専用のため移動できません</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation>移動先</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation>移動元</translation>
    </message>
@@ -2142,17 +2137,17 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="234"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;バージョン %1. 詳細な情報は&lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;を確認してください。&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="238"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorparated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Copyright ownCloud, Incorparated&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="239"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;%1 が配布し、 GNU General Public License (GPL) バージョン2.0 の下でライセンスされています。&lt;br/&gt;%2 及び %2 のロゴはアメリカ合衆国またはその他の国、あるいはその両方における %1 の登録商標です。&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -2330,7 +2325,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="122"/>
        <source>Choose what to sync</source>
-        <translation>同期フォルダーを選択</translation>
+        <translation>同期フォルダを選択</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="178"/>
@@ -2340,7 +2335,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="221"/>
        <source>&amp;Start a clean sync (Erases the local folder!)</source>
-        <translation>クリーン同期を開始(&amp;S) (ローカルフォルダーは削除)</translation>
+        <translation>クリーン同期を開始(&amp;S) (ローカルフォルダは削除)</translation>
    </message>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="256"/>
@@ -2573,7 +2568,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="40"/>
        <source>Moved to %1</source>
-        <translation>%1に移動済み</translation>
+        <translation>%1　へ移動完了</translation>
    </message>
    <message>
        <location filename="../src/mirall/progressdispatcher.cpp" line="42"/>
@@ -482,17 +482,17 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>Bestand</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>Alle bestanden in uw account worden gesynchroniseerd met </translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>Extern pad: %1</translation>
    </message>
@@ -1114,7 +1114,7 @@ We adviseren deze site niet te gebruiken.</translation>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="153"/>
        <source>&amp;Next &gt;</source>
-        <translation>&amp;Volgende &gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="233"/>
@@ -1875,255 +1875,250 @@ We adviseren deze site niet te gebruiken.</translation>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>Succes.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>CSync kon geen lock file maken.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation>CSync kon het journal bestand niet maken of lezen. Controleer of u de juiste lees- en schrijfrechten in de lokale syncmap hebt.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation>CSync kon het journal bestand niet wegschrijven.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;De %1 plugin voor csync kon niet worden geladen.&lt;br/&gt;Verifieer de installatie!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>De systeemtijd van deze client wijkt af van de systeemtijd op de server. Gebruik een tijdsynchronisatieservice (NTP) op zowel de server als de client, zodat de machines dezelfde systeemtijd hebben.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>CSync kon het soort bestandssysteem niet bepalen.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync kreeg een fout tijdens het verwerken van de interne mappenstructuur.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync kon geen geheugen reserveren.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>CSync fatale parameter fout.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>CSync verwerkingsstap bijwerken mislukt.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSync verwerkingsstap verzamelen mislukt.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>CSync verwerkingsstap doorzetten mislukt.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;De doelmap bestaat niet.&lt;/p&gt;&lt;p&gt;Controleer de synchinstellingen.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>Een extern bestand kon niet worden weggeschreven. Controleer de externe rechten.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>Er kan niet worden geschreven naar het lokale bestandssysteem. Controleer de schrijfrechten.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSync kon niet verbinden via een proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync kon niet authenticeren bij de proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync kon geen proxy of server vinden.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync kon niet authenticeren bij de  %1 server.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync kon niet verbinden met het netwerk.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation>Er trad een netwerk time-out op.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Er trad een HTTP transmissiefout plaats.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>CSync mislukt omdat de benodigde toegang werd geweigerd.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation>CSync kreeg geen toegang</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>CSync probeerde een al bestaande directory aan te maken.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Geen ruimte op %1 server beschikbaar.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>CSync ongedefinieerde fout.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Afgebroken door de gebruiker</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation>De gemounte map is tijdelijk niet beschikbaar op de server</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation>Interne fout nummer %1 opgetreden.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Dit onderwerp is niet gesynchroniseerd door eerdere fouten: %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Symbolic links worden niet ondersteund bij het synchroniseren.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation>Harde links worden niet ondersteund bij synchronisatie.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation>Het bestand is opgenomen op de negeerlijst.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation>Bestand bevat ongeldige karakters die niet tussen platformen gesynchroniseerd kunnen worden.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation>Bestandsnaamcodering is niet geldig</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Niet in staat om een synchronisatie transactielog te starten.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation>Kan het sync transactielog niet openen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Genegeerd vanwege de &quot;selectieve synchronisatie&quot; zwarte lijst</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Niet toegestaan, omdat u geen rechten hebt om sub-directories aan te maken in die directory</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Niet toegestaan, omdat u geen rechten hebt om een bovenliggende directories toe te voegen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Niet toegestaan, omdat u geen rechten hebt om bestanden in die directory toe te voegen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Niet toegestaan te verwijderen, herstellen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation>Lokale bestanden en share-map verwijderd. </translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation>Verplaatsen niet toegestaan, object hersteld</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Verplaatsen niet toegestaan omdat %1 alleen-lezen is</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation>bestemming</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation>bron</translation>
    </message>
@@ -482,17 +482,17 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>Plik</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>Synchronizacja wszystkich plików na koncie z</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>Zdalna ścieżka: %1</translation>
    </message>
@@ -1872,255 +1872,250 @@ Niezalecane jest jego użycie.</translation>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>Sukces.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>CSync nie mógł utworzyć pliku blokady.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation>CSync nie powiodło się załadowanie lub utworzenie pliku dziennika. Upewnij się, że masz prawa do odczytu i zapisu do lokalnego katalogu synchronizacji.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation>CSync nie udało się zapisać pliku dziennika.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;Wtyczka %1 do csync nie może być załadowana.&lt;br/&gt;Sprawdź poprawność instalacji!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>Czas systemowy na tym kliencie różni się od czasu systemowego na serwerze. Użyj usługi synchronizacji czasu (NTP) na serwerze i kliencie, aby czas na obu urządzeniach był taki sam.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>CSync nie może wykryć typu systemu plików.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync napotkał błąd podczas przetwarzania wewnętrznych drzew.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync nie mógł zarezerwować pamięci.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>Krytyczny błąd parametru CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>Aktualizacja procesu przetwarzania CSync nie powiodła się.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>Scalenie w procesie przetwarzania CSync nie powiodło się.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>Propagacja w procesie przetwarzania CSync nie powiodła się.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Katalog docelowy nie istnieje.&lt;/p&gt;&lt;p&gt;Sprawdź ustawienia synchronizacji.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>Zdalny plik nie może zostać zapisany. Sprawdź dostęp zdalny.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>Nie można  zapisywać na lokalnym systemie plików. Sprawdź uprawnienia.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSync nie mógł połączyć się przez proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync nie mógł się uwierzytelnić przez proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync nie mógł odnaleźć serwera proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync nie mógł uwierzytelnić się na serwerze %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync nie mógł połączyć się z siecią.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation>Upłynął limit czasu połączenia.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Wystąpił błąd transmisji HTTP.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>CSync nie obsługiwane, odmowa uprawnień.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation>Synchronizacja nieudana z powodu braku dostępu</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>CSync próbował utworzyć katalog, który już istnieje.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Brak dostępnego miejsca na serwerze %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>Nieokreślony błąd CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Anulowane przez użytkownika</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation>Wystąpił błąd wewnętrzny numer %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Ten element nie jest zsynchronizowane z powodu poprzednich błędów: %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Linki symboliczne nie są wspierane przy synchronizacji. </translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation>Linki stałe nie są wspierane podczas synchronizacji.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation>Plik jest na liście plików ignorowanych.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation>Plik zawiera nieprawidłowe znaki, które nie mogą być synchronizowane wieloplatformowo.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Nie można zainicjować synchronizacji dziennika.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation>Nie można otworzyć dziennika synchronizacji</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Nie masz uprawnień do dodawania podkatalogów w tym katalogu.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Nie masz uprawnień by dodać katalog nadrzędny</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Nie masz uprawnień by dodać pliki w tym katalogu</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Wgrywanie niedozwolone, ponieważ plik jest tylko do odczytu na serwerze, przywracanie</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Brak uprawnień by usunąć, przywracanie</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation>Przenoszenie niedozwolone, obiekt przywrócony</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Przenoszenie niedozwolone, ponieważ %1 jest tylko do odczytu</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation>docelowy</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation>źródło</translation>
    </message>
@@ -481,17 +481,17 @@ Se você, ou o seu administrador, reiniciou  a sua conta no servidor, escolha &q
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>Ficheiro</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>A sincronizar todos os ficheiros na sua conta com</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>Caminho remoto: %1</translation>
    </message>
@@ -1873,256 +1873,251 @@ It is not advisable to use it.</source>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>Sucesso</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>CSync falhou a criação do ficheiro de lock.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation>CSync falhou no carregamento ou criação do ficheiro jornal. Confirme que tem permissões de escrita e leitura no directório de sincronismo local.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation>CSync falhou a escrever o ficheiro do jornal.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;O plugin %1 para o CSync não foi carregado.&lt;br/&gt;Por favor verifique a instalação!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>A data/hora neste cliente é difere da data/hora do servidor.
 Por favor utilize um servidor de sincronização horária (NTP), no servidor e nos clientes para garantir que a data/hora são iguais.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>Csync não conseguiu detectar o tipo de sistema de ficheiros.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>Csync obteve um erro enquanto processava as árvores internas.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>O CSync falhou a reservar memória</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>Parametro errado, CSync falhou</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>O passo de processamento do CSyn falhou</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSync: Processo de reconciliação falhou.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>CSync: O processo de propagação falhou.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;A pasta de destino não existe.&lt;/p&gt;&lt;p&gt;Por favor verifique a configuração da sincronização.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>Não é possivel escrever num ficheiro remoto. Por favor verifique o acesso remoto.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>Não é possivel escrever no sistema de ficheiros local. Por favor verifique as permissões.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSync: Erro a ligar através do proxy</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync: erro ao autenticar-se no servidor proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync: Erro a contactar o proxy ou o servidor.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync: Erro a autenticar no servidor %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync: Erro na conecção à rede</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation>Houve um erro de timeout de rede.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Ocorreu um erro de transmissão HTTP</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>CSync: Erro devido a permissões de negação não tratadas.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation>CSync: falha no acesso</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>O CSync tentou criar uma pasta que já existe.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Não ha espaço disponível no servidor %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>CSync: erro não especificado</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Cancelado pelo utilizador</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation>O directório montado está temporariamente indisponível no servidor</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation>Ocorreu um erro interno número %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>O item não está sincronizado devido a erros anteriores: %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Hiperligações simbólicas não são suportadas em sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation>Hard links não são suportados em sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation>O ficheiro está na lista de ficheiros a ignorar.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation>O ficheiro contém caracteres inválidos que não podem ser sincronizados pelas várias plataformas.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Impossível inicializar sincronização &apos;journal&apos;.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation>Impossível abrir o jornal de sincronismo</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorado devido à blacklist de escolha para sincronização</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Não permitido, porque não tem permissão para adicionar sub-directórios ao directório</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Não permitido, porque não tem permissão para adicionar o directório principal</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Não permitido, porque não tem permissão para adicionar ficheiros no directório</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Não é permitido fazer o envio deste ficheiro porque é só de leitura no servidor, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Não autorizado para remoção, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation>Ficheiros locais e pasta partilhada removidos.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation>Mover não foi permitido, item restaurado</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Mover não foi autorizado porque %1 é só de leitura</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation>o destino</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation>a origem</translation>
    </message>
@@ -198,7 +198,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="607"/>
        <source>Discovering &apos;%1&apos;</source>
-        <translation>Descobrir &apos;%1&apos;</translation>
+        <translation>Descobrir &apos;%&apos;1&apos;</translation>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="647"/>
@@ -482,17 +482,17 @@ Você tem certeza que quer executar esta operação?</translation>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>Arquivo</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>Sincronizando todos os arquivos em sua conta com</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>Caminho remoto: %1</translation>
    </message>
@@ -1112,7 +1112,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="153"/>
        <source>&amp;Next &gt;</source>
-        <translation>&amp;Póximo &gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="233"/>
@@ -1873,255 +1873,250 @@ It is not advisable to use it.</source>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>Sucesso.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>Falha ao criar o arquivo de trava pelo CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation>Csync falhou ao carregar ou criar o arquivo jornal. Certifique-se de ter permissão de escrita no diretório de sincronização local.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation>Csync falhou ao tentar gravar o arquivo jornal.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;O plugin %1 para csync não foi carregado.&lt;br/&gt;Por favor verifique a instalação!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>A hora do sistema neste cliente é diferente da hora de sistema no servidor. Por favor, use um serviço de sincronização de tempo (NTP) no servidor e máquinas clientes para que as datas continuam as mesmas.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>Tipo de sistema de arquivo não detectado pelo CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>Erro do CSync enquanto processava árvores internas.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync falhou ao reservar memória.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>Erro fatal de parametro do CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>Processamento da atualização do CSync falhou.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>Processamento da conciliação do CSync falhou.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>Processamento da propagação do CSync falhou.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;O diretório de destino não existe.&lt;/p&gt; &lt;p&gt;Por favor, verifique a configuração de sincronização. &lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>O arquivo remoto não pode ser escrito. Por Favor, verifique o acesso remoto.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>O sistema de arquivos local não pode ser escrito. Por favor, verifique as permissões.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSync falhou ao conectar por um proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>Csync não conseguiu autenticação no proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync falhou ao localizar o proxy ou servidor.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync falhou ao autenticar no servidor %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync falhou ao conectar à rede.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation>Ocorreu uma desconexão de rede. </translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Houve um erro na transmissão HTTP.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>CSync falhou devido a uma negativa de permissão não resolvida.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation>Falha no acesso CSync</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>CSync tentou criar um diretório que já existe.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Sem espaço disponível no servidor %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>Erro não especificado no CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Abortado pelo usuário</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation>O diretório montado não esta disponível temporáriamente no servidor</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation>Ocorreu um erro interno de número %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>O item não está sincronizado devido a erros anteriores: %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Linques simbólicos não são suportados em sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation>Links físicos não são compatíveis com a sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation>O arquivo está listado na lista de ignorados.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation>Arquivos que contém caracteres inválidos não podem ser sincronizados através de plataformas. </translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation>A codificação do nome do arquivo não é válida</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Impossibilitado de iniciar a sincronização.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation>Não é possível abrir o arquivo de sincronização</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorado por causa da lista negra &quot;escolher o que sincronizar&quot;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Não permitido porque você não tem permissão de criar sub-pastas nesta pasta</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Não permitido porque você não tem permissão de criar pastas mãe</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Não permitido porque você não tem permissão de adicionar arquivos a esta pasta</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Não é permitido fazer o upload deste arquivo porque ele é somente leitura no servidor, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Não é permitido remover, restaurando</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation>Arquivos locais e pasta compartilhada removida.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation>Não é permitido mover, item restaurado</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Não é permitido mover porque %1 é somente para leitura</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation>o destino</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation>a fonte</translation>
    </message>
@@ -37,7 +37,7 @@
    <message>
        <location filename="../src/mirall/folderwizardtargetpage.ui" line="140"/>
        <source>Create Folder</source>
-        <translation>Vytvoriť priečinok</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/folderwizardtargetpage.ui" line="160"/>
@@ -198,7 +198,7 @@
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="607"/>
        <source>Discovering &apos;%1&apos;</source>
-        <translation>Prehľadávam &apos;%1&apos;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/accountsettings.cpp" line="647"/>
@@ -373,12 +373,12 @@ Celkom zostáva %5</translation>
        <location filename="../src/mirall/folder.cpp" line="490"/>
        <source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
        <comment>%1 names a file.</comment>
-        <translation>%1 a %2 ďalšie súbory nemožno synchronizovať kvôli chybám. Pozrite sa do logu pre podrobnosti.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/folder.cpp" line="492"/>
        <source>%1 could not be synced due to an error. See the log for details.</source>
-        <translation>%1 nemôže byť synchronizovaný kvôli chybe. Pozrite sa do logu pre podrobnosti.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/folder.cpp" line="500"/>
@@ -388,7 +388,7 @@ Celkom zostáva %5</translation>
    <message>
        <location filename="../src/mirall/folder.cpp" line="745"/>
        <source>Could not read system exclude file</source>
-        <translation>Nemožno čítať systémový exclude file</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/folder.cpp" line="962"/>
@@ -482,17 +482,17 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>Súbor</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>Synchronizácia všetkých súborov vo vašom účte z</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>Vzdialená cesta: %1</translation>
    </message>
@@ -579,12 +579,12 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="257"/>
        <source>Create Remote Folder</source>
-        <translation>Vytvoriť vzdialený priečinok</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="258"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
-        <translation>Zadajte názov nového priečinka, ktorý bude vytvorený v &apos;%1&apos;:</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="287"/>
@@ -1018,7 +1018,7 @@ si počas procesu aktualizácie môže vyžiadať dodatočné práva.</translati
    <message>
        <location filename="../src/updater/ocupdater.cpp" line="89"/>
        <source>Update status is unknown: Did not check for new updates.</source>
-        <translation>Stav aktualizácie nie je známy: Neboli skontrolované nové aktualizácie.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/updater/ocupdater.cpp" line="93"/>
@@ -1114,12 +1114,12 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="153"/>
        <source>&amp;Next &gt;</source>
-        <translation>&amp;Ďalšia &gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="233"/>
        <source>&lt;p&gt;Could not connect securely:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Do you want to connect unencrypted instead (not recommended)?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Nedá sa pripojiť zabezpečene:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Chcete sa namiesto toho pripojiť nezabezpečene (neodporúča sa)?&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="234"/>
@@ -1331,12 +1331,12 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/mirall/propagator_qnam.cpp" line="755"/>
        <source>The file could not be downloaded completely.</source>
-        <translation>Súbor sa nedá stiahnuť úplne.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/propagator_qnam.cpp" line="791"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
-        <translation>Súbor %1 nie je možné uložiť, pretože jeho názov koliduje s názvom lokálneho súboru!</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -1370,12 +1370,12 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
        <source>Error removing &apos;%1&apos;: %2; </source>
-        <translation>Chyba pri mazaní &apos;%1&apos;: %2; </translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
        <source>Could not remove directory &apos;%1&apos;; </source>
-        <translation>Nemožno odstrániť priečinok &apos;%1&apos;; </translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
@@ -1535,26 +1535,24 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/mirall/protocolwidget.cpp" line="262"/>
        <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source>
-        <translation>V súčastnosti nie sú na čiernej listine žiadne súbory kvôli predchádzajúcim chybovým stavom a neprebieha žiadne sťahovanie.</translation>
+        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="265"/>
        <source>%n files are ignored because of previous errors.
 </source>
-        <translation><numerusform>%n súbor je na čiernej listine kvôli predchádzajúcim chybovým stavom.</numerusform><numerusform>%n súbory sú na čiernej listine kvôli predchádzajúcim chybovým stavom.</numerusform><numerusform>%n súborov je na čiernej listine kvôli predchádzajúcim chybovým stavom.
-</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="266"/>
        <source>%n files are partially downloaded.
 </source>
-        <translation><numerusform>%n súbor je čiastočne stiahnutý.</numerusform><numerusform>%n súbory sú čiastočne stiahnuté.</numerusform><numerusform>%n súborov je čiastočne stiahnutých.
-</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
        <location filename="../src/mirall/protocolwidget.cpp" line="267"/>
        <source>Try to sync these again.</source>
-        <translation>Skúste synchronizovať znova.</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -1567,7 +1565,7 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/mirall/selectivesyncdialog.cpp" line="274"/>
        <source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
-        <translation>Neoznačené priečinky budú &lt;b&gt;odstránené&lt;/b&gt; z lokálneho systému a nebudú už synchronizované na tento počítač</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -1874,255 +1872,250 @@ Nie je vhodné ju používať.</translation>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>Úspech.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>Vytvorenie &quot;zamykacieho&quot; súboru cez &quot;CSync&quot; zlyhalo.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation>CSync sa nepodarilo načítať alebo vytvoriť súbor žurnálu. Uistite sa, že máte oprávnenia na čítanie a zápis v lokálnom synchronizovanom priečinku.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation>CSync sa nepodarilo zapísať do súboru žurnálu.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;%1 zásuvný modul pre &quot;CSync&quot; nebolo možné načítať.&lt;br/&gt;Prosím skontrolujte inštaláciu!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>Systémový čas tohoto klienta je odlišný od systémového času na serveri. Prosím zvážte použitie sieťovej časovej synchronizačnej služby (NTP) na serveri a klientských strojoch, aby bol na nich rovnaký čas.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>Detekcia súborového systému vrámci &quot;CSync&quot; zlyhala.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>Spracovanie &quot;vnútorných stromov&quot; vrámci &quot;CSync&quot; zlyhalo.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync sa nepodarilo zarezervovať pamäť.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>CSync kritická chyba parametrov.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>CSync sa nepodarilo spracovať krok aktualizácie.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSync sa nepodarilo spracovať krok zladenia.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>CSync sa nepodarilo spracovať krok propagácie.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Cieľový priečinok neexistuje.&lt;/p&gt;&lt;p&gt;Skontrolujte, prosím, nastavenia synchronizácie.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>Vzdialený súbor nie je možné zapísať. Prosím skontrolujte vzdialený prístup.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>Do lokálneho súborového systému nie je možné zapisovať. Prosím skontrolujte povolenia.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSync sa nepodarilo prihlásiť cez proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync sa nemohol prihlásiť k proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync sa nepodarilo nájsť proxy alebo server.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync sa nepodarilo prihlásiť na server %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync sa nepodarilo pripojiť k sieti.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation>Skončil časový limit sieťového spojenia.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Chyba HTTP prenosu.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>CSync zlyhalo. Nedostatočné oprávnenie.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation>CSync nepodaril prístup</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>CSync sa pokúsil vytvoriť priečinok, ktorý už existuje.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Na serveri %1 nie je žiadne voľné miesto.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>CSync nešpecifikovaná chyba.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Zrušené používateľom</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
-        <translation>Pripojený priečinok je na serveri dočasne nedostupný</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation>Vyskytla sa vnútorná chyba číslo %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Položka nebola synchronizovaná kvôli predchádzajúcej chybe: %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Symbolické odkazy nie sú podporované pri synchronizácii.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
-        <translation>Pevné odkazy nie sú pri synchronizácii podporované.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation>Súbor je zapísaný na zozname ignorovaných.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation>Súbor obsahuje neplatné znaky, ktoré nemôžu byť zosynchronizované medzi platformami.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation>Kódovanie znakov názvu súboru je neplatné</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Nemôžem inicializovať synchronizačný žurnál.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation>Nemožno otvoriť sync žurnál</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
-        <translation>Ignorované podľa nastavenia &quot;vybrať čo synchronizovať&quot;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
-        <translation>Nie je dovolené, pretože nemáte oprávnenie pridávať do tohto priečinka podpriečinky</translation>
+        <translation>Nie je dovolené, pretože nemáte oprávnenie pridávať do tohto adresára podadresáre.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
-        <translation>Nie je dovolené, pretože nemáte oprávnenie pridať nadradený priečinok.</translation>
+        <translation>Nie je dovolené, pretože nemáte oprávnenie pridať nadradený adresár.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
-        <translation>Nie je dovolené, pretože nemáte oprávnenie pridávať do tohto priečinka súbory.</translation>
+        <translation>Nie je dovolené, pretože nemáte oprávnenie pridávať do tohto adresára súbory.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Nie je dovolené tento súbor nahrať, pretože je na serveri iba na čítanie. Obnovuje sa.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Nie je dovolené odstrániť. Obnovuje sa.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
-        <translation>Lokálne súbory a zdieľaný priečinok boli odstránené.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation>Presunutie nie je dovolené. Položka obnovená.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Presunutie nie je dovolené, pretože %1 je na serveri iba na čítanie</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation>cieľ</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation>zdroj</translation>
    </message>
@@ -2140,17 +2133,17 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/mirall/theme.cpp" line="234"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Verzia %1. Pre viac informácií choďte na &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="238"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorparated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Copyright ownCloud, Incorparated&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="239"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Šíri %1 pod licenciou GNU General Public License (GPL) Verzia 2.0.&lt;br/&gt;%2 a %2 logo sú registrované známky %1 v USA, ostatných krajinách, alebo oboje.&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -2178,7 +2171,7 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/mirall/owncloudgui.cpp" line="281"/>
        <source>There are no sync folders configured.</source>
-        <translation>Nie sú nastavené žiadne priečinky na synchronizáciu.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/owncloudgui.cpp" line="307"/>
@@ -2268,7 +2261,7 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/mirall/owncloudgui.cpp" line="471"/>
        <source>Discovering &apos;%1&apos;</source>
-        <translation>Prehľadávam &apos;%1&apos;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/owncloudgui.cpp" line="476"/>
@@ -2296,7 +2289,7 @@ Nie je vhodné ju používať.</translation>
    <message utf8="true">
        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;br/&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Verzia %2. Ďalšie informácie získate na adrese &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz a ďalší.&lt;br/&gt;Založené na Mirall, ktorý napísal Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licencované za podmienok GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud a ownCloud logo sú sú registrované obchodné známky ownCloud, Inc. v USA, ďalších krajinách, alebo oboje.&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -2328,7 +2321,7 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="122"/>
        <source>Choose what to sync</source>
-        <translation>Vybrať čo synchronizovať</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="178"/>
@@ -2338,7 +2331,7 @@ Nie je vhodné ju používať.</translation>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="221"/>
        <source>&amp;Start a clean sync (Erases the local folder!)</source>
-        <translation>&amp;Spustiť novú synchronizáciu (Vymaže obsah lokálneho priečinka!)</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/wizard/owncloudadvancedsetuppage.ui" line="256"/>
@@ -482,17 +482,17 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>Datoteka</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>Usklajevanje vseh datotek z mestom</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>Oddaljena pot: %1</translation>
    </message>
@@ -1114,7 +1114,7 @@ Uporaba ni priporočljiva.</translation>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="153"/>
        <source>&amp;Next &gt;</source>
-        <translation>&amp;Naslednja &gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="233"/>
@@ -1880,255 +1880,250 @@ Uporaba ni priporočljiva.</translation>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>Uspešno končano.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>Ustvarjanje datoteke zaklepa s CSync je spodletelo.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation>Nalaganje ali ustvarjanje dnevniške datoteke s CSync je spodletelo. Za to opravilo so zahtevana posebna dovoljenja krajevne mape za usklajevanje.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation>Zapisovanje dnevniške datoteke s CSync je spodletelo.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;Vstavka %1 za CSync ni mogoče naložiti.&lt;br/&gt;Preverite namestitev!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>Sistemski čas na odjemalcu ni skladen s sistemskim časom na strežniku. Priporočljivo je uporabiti storitev usklajevanja časa (NTP) na strežniku in odjemalcu. S tem omogočimo ujemanje podatkov o času krajevnih in oddaljenih datotek.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>Zaznavanje vrste datotečnega sistema s CSync je spodletelo.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>Pri obdelavi notranje drevesne strukture s CSync je prišlo do napake.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>Vpisovanje prostora v pomnilniku za CSync je spodletelo.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>Usodna napaka parametra CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>Korak opravila posodobitve CSync je spodletel.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>Korak opravila poravnave CSync je spodletel.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>Korak opravila razširjanja CSync je spodletel.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Ciljna mapa ne obstaja.&lt;/p&gt;&lt;p&gt;Preveriti je treba nastavitve usklajevanja.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>Oddaljene datoteke ni mogoče zapisati. Najverjetneje je vzrok v oddaljenem dostopu.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>V krajevni datotečni sistem ni mogoče pisati. Najverjetneje je vzrok v neustreznih dovoljenjih.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>Povezava CSync preko posredniškega strežnika je spodletel.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>Overitev CSync na posredniškem strežniku je spodletela.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>Poizvedba posredniškega strežnika s CSync je spodletela.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>Overitev CSync pri strežniku %1 je spodletela.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>Povezava CSync v omrežje je spodletela.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation>Omrežna povezava je časovno potekla.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Prišlo je do napake med prenosom HTTP.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>Delovanje CSync je zaradi neustreznih dovoljenj spodletelo.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation>Dostop s CSync je spodletel</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>Prišlo je do napake programa CSync zaradi poskusa ustvarjanja mape z že obstoječim imenom.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>Odziv CSync: na strežniku %1 ni razpoložljivega prostora.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>Nedoločena napaka CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Opravilo je bilo prekinjeno s strani uporabnika</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation>Priklopljena mapa trenutno ni na voljo na strežniku.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation>Prišlo je do notranje napake številka %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Predmet ni usklajen zaradi predhodne napake: %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Usklajevanje simbolnih povezav ni podprto.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation>Usklajevanje ne podpira trdih povezav.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation>Datoteka je na seznamu prezrtih datotek.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation>Ime datoteke vsebuje neveljavne znake, ki niso podprti na vseh okoljih.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation>Kodni zapis imena datoteke ni veljaven.</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Dnevnika usklajevanja ni mogoče začeti.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation>Ni mogoče odpreti dnevnika usklajevanja</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Prezrto, ker ni neizbrano za usklajevanje</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Ni ustreznih dovoljenj za dodajanje podmap v izbrano mapo.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Ni ustreznih dovoljenj za dodajanje nadrejene mape.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Ni ustreznih dovoljenj za dodajanje datotek v izbrano mapo.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Ni dovoljeno pošiljati te datoteke, ker ima določena dovoljenja le za branje. Datoteka bo obnovljena na izvorno različico.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Odstranitev ni dovoljena, datoteka bo obnovljena.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation>Krajevne datoteke in mape v souporabi so odstranjene.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation>Premikanje ni dovoljeno, datoteka bo obnovljena.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Premikanje ni dovoljeno, ker je nastavljeno določilo %1 le za branje.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation>cilj</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation>vir</translation>
    </message>
@@ -2146,17 +2141,17 @@ Uporaba ni priporočljiva.</translation>
    <message>
        <location filename="../src/mirall/theme.cpp" line="234"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Različica %1. Za več podrobnosti si oglejte &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="238"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorparated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Avtorske pravice ownCloud, Inc&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="239"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Programski paket objavlja %1 pod pogoji Splošnega javnega dovoljenja GNU (GNU General Public License - GPL), različice 2.0.&lt;br&gt;%2 in logotip %2 sta blagovni znamki %1 v Združenih državah, drugih državah ali oboje.&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -37,7 +37,7 @@
    <message>
        <location filename="../src/mirall/folderwizardtargetpage.ui" line="140"/>
        <source>Create Folder</source>
-        <translation>Skapa mapp</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/folderwizardtargetpage.ui" line="160"/>
@@ -278,7 +278,7 @@ Total tid kvar %5</translation>
    <message>
        <location filename="../src/mirall/connectionvalidator.cpp" line="138"/>
        <source>timeout</source>
-        <translation>timeout</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/connectionvalidator.cpp" line="167"/>
@@ -388,7 +388,7 @@ Total tid kvar %5</translation>
    <message>
        <location filename="../src/mirall/folder.cpp" line="745"/>
        <source>Could not read system exclude file</source>
-        <translation>Kunde inte läsa systemets exkluderings-fil</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/folder.cpp" line="962"/>
@@ -482,17 +482,17 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>Fil</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>Synkroniserar alla filer i ditt konto med</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>Fjärrsökväg: %1</translation>
    </message>
@@ -579,12 +579,12 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="257"/>
        <source>Create Remote Folder</source>
-        <translation>Skapa fjärrmapp</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="258"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
-        <translation>Ange namnet på den  nya mappen som skall skapas under &apos;%1&apos;:</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="287"/>
@@ -649,7 +649,7 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
    <message>
        <location filename="../src/mirall/propagator_qnam.cpp" line="540"/>
        <source>Server returned wrong content-range</source>
-        <translation>Servern returnerade felaktig content-range</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/propagator_qnam.cpp" line="579"/>
@@ -1114,12 +1114,12 @@ Det är inte lämpligt använda den.</translation>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="153"/>
        <source>&amp;Next &gt;</source>
-        <translation>&amp;Nästa &gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="233"/>
        <source>&lt;p&gt;Could not connect securely:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Do you want to connect unencrypted instead (not recommended)?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Kunde inte ansluta säkert:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Vill du ansluta okrypterat istället (rekommenderas ej)?&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="234"/>
@@ -1313,7 +1313,7 @@ Det är inte lämpligt använda den.</translation>
    <message>
        <location filename="../src/mirall/propagator_legacy.cpp" line="444"/>
        <source>Server returned wrong content-range</source>
-        <translation>Servern returnerade felaktig content-range</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/propagator_legacy.cpp" line="495"/>
@@ -1331,12 +1331,12 @@ Det är inte lämpligt använda den.</translation>
    <message>
        <location filename="../src/mirall/propagator_qnam.cpp" line="755"/>
        <source>The file could not be downloaded completely.</source>
-        <translation>Filen kunde inte laddas ner fullständigt.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/propagator_qnam.cpp" line="791"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
-        <translation>Fil %1 kan inte sparas eftersom namnet krockar med en lokal fil!</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -1370,12 +1370,12 @@ Det är inte lämpligt använda den.</translation>
    <message>
        <location filename="../src/mirall/propagatorjobs.cpp" line="68"/>
        <source>Error removing &apos;%1&apos;: %2; </source>
-        <translation>Fel vid borttagning av &apos;%1&apos;: %2; </translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/propagatorjobs.cpp" line="79"/>
        <source>Could not remove directory &apos;%1&apos;; </source>
-        <translation>Kunde inte ta bort katalog &apos;%1&apos;; </translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/propagatorjobs.cpp" line="94"/>
@@ -1535,27 +1535,24 @@ Det är inte lämpligt använda den.</translation>
    <message>
        <location filename="../src/mirall/protocolwidget.cpp" line="262"/>
        <source>Currently no files are ignored because of previous errors and no downloads are in progress.</source>
-        <translation>För närvarande är inga filer ignorerade på grund av föregående fel och inga nerladdningar pågår.</translation>
+        <translation type="unfinished"/>
    </message>
    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="265"/>
        <source>%n files are ignored because of previous errors.
 </source>
-        <translation><numerusform>%n fil ignoreras på grund av föregående fel.
-</numerusform><numerusform>%n filer ignoreras på grund av föregående fel.
-</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message numerus="yes">
        <location filename="../src/mirall/protocolwidget.cpp" line="266"/>
        <source>%n files are partially downloaded.
 </source>
-        <translation><numerusform>%n fil är delvis nerladdad.</numerusform><numerusform>%n filer är delvis nerladdade.
-</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
    </message>
    <message>
        <location filename="../src/mirall/protocolwidget.cpp" line="267"/>
        <source>Try to sync these again.</source>
-        <translation>Försök att synkronisera dessa igen.</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -1875,255 +1872,250 @@ Det är inte lämpligt använda den.</translation>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>Lyckades.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>CSync misslyckades med att skapa en låsfil.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation>CSync misslyckades att skapa en journal fil. Se till att du har läs och skriv rättigheter i den lokala synk katalogen.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation>CSynk misslyckades att skriva till journal filen.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;Plugin %1 för csync kunde inte laddas.&lt;br/&gt;Var god verifiera installationen!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>Systemtiden på denna klientdator är annorlunda än systemtiden på servern. Använd en tjänst för tidssynkronisering (NTP) på servern och alla klientdatorer så att tiden är lika.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>CSync kunde inte upptäcka filsystemtyp.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSYNC fel vid intern bearbetning.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync misslyckades att reservera minne.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>CSync fatal parameter fel.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>CSync processteg update misslyckades.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSync processteg reconcile misslyckades.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>CSync processteg propagate misslyckades.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Målmappen finns inte&lt;/p&gt;&lt;p&gt;Vänligen, kontroller inställningen för sync.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>En fil på servern kan inte skapas. Kontrollera åtkomst till fjärranslutningen.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>Kan inte skriva till det lokala filsystemet. Var god kontrollera rättigheterna.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSync misslyckades att ansluta genom en proxy.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync kunde inte autentisera mot proxy. </translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync misslyckades att  hitta proxy eller server.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync misslyckades att autentisera mot %1 servern.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync misslyckades att ansluta mot nätverket.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation>En timeout på nätverksanslutningen har inträffat.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Ett HTTP överföringsfel inträffade.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>CSYNC misslyckades på grund av att nekad åtkomst inte hanterades.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation>CSynk misslyckades att tillträda</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>CSync försökte skapa en mapp som redan finns.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: Ingen plats på %1 server tillgänglig.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>CSync ospecificerat fel.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Avbruten av användare</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
-        <translation>Den monterade katalogen är temporärt ej tillgänglig på servern</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation>Ett internt fel hände. nummer %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Objektet kunde inte synkas på grund av tidigare fel: %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Symboliska länkar stöds ej i synkningen.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
-        <translation>Hårda länkar stöds ej vid synkronisering.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation>Filen är listad i ignorerings listan.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation>Filen innehåller ogiltiga tecken som inte kan synkas oberoende av plattform.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation>Filnamnskodning är inte giltig</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Kan inte initialisera en synk journal. </translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation>Kunde inte öppna synk journalen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ignorerad eftersom den är svartlistad i &quot;välj vad som ska synkas&quot; </translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Går ej att genomföra då du saknar rättigheter att lägga till underkataloger i den katalogen </translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Går ej att genomföra då du saknar rättigheter att lägga till någon moderkatalog</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Går ej att genomföra då du saknar rättigheter att lägga till filer i den katalogen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Inte behörig att ladda upp denna fil då den är skrivskyddad på servern, återställer </translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Inte behörig att radera, återställer</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation>Lokala filer och mappar som är delade är borttagna.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation>Det gick inte att genomföra flytten, objektet återställs</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Det gick inte att genomföra flytten då %1 är skrivskyddad</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation>destinationen</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation>källan</translation>
    </message>
@@ -2141,17 +2133,17 @@ Det är inte lämpligt använda den.</translation>
    <message>
        <location filename="../src/mirall/theme.cpp" line="234"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Version %1. För mer information vänligen besök &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="238"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorparated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Upphovsrätten tillhör ownCloud, Incorparated&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="239"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Distribueras av %1 och licenserad under GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 och %2 logotyp är registrerade varumärken av %1 i Förenta Staterna, andra länder, eller både och.&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -2297,7 +2289,7 @@ Det är inte lämpligt använda den.</translation>
    <message utf8="true">
        <location filename="../src/mirall/owncloudtheme.cpp" line="48"/>
        <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;br/&gt;Based on Mirall by Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Version %2. För mer information besök &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Av Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz och andra.&lt;br/&gt;Baserad på Mirall av Duncan Mac-Vicar P.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Upphovsrätt ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensierad under GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud och ownCloud Logon är registerede varumärken som tillhör ownCloud, Inc. i USA, andra länder, eller båda.&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -479,17 +479,17 @@ Are you sure you want to perform this operation?</source>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>ตำแหน่งพาธระยะไกล: %1</translation>
    </message>
@@ -1863,255 +1863,250 @@ It is not advisable to use it.</source>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>เสร็จสิ้น</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>CSync ล้มเหลวในการสร้างไฟล์ล็อคข้อมูล</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;ปลั๊กอิน %1 สำหรับ csync could not be loadeไม่สามารถโหลดได้.&lt;br/&gt;กรุณาตรวจสอบความถูกต้องในการติดตั้ง!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>เวลาในระบบของโปรแกรมไคลเอนต์นี้แตกต่างจากเวลาในระบบของเซิร์ฟเวอร์ กรุณาใช้บริการผสานข้อมูลของเวลา (NTP) บนเซิร์ฟเวอร์และเครื่องไคลเอนต์เพื่อปรับเวลาให้ตรงกัน</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>CSync ไม่สามารถตรวจพบประเภทของไฟล์ในระบบได้</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync เกิดข้อผิดพลาดบางประการในระหว่างประมวลผล internal trees</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>การจัดสรรหน่วยความจำ CSync ล้มเหลว</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>พบข้อผิดพลาดเกี่ยวกับ CSync fatal parameter</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>การอัพเดทขั้นตอนการประมวลผล CSync ล้มเหลว</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>การปรับปรุงขั้นตอนการประมวลผล CSync ล้มเหลว</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>การถ่ายทอดขั้นตอนการประมวลผล CSync ล้มเหลว</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>ไม่สามารถเขียนข้อมูลไปยังไฟล์ระยะไกลได้ กรุณาตรวจสอบการเข้าถึงข้อมูลระยะไกล</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>ระบบไฟล์ในพื้นที่ไม่สามารถเขียนข้อมูลได้ กรุณาตรวจสอบสิทธิ์การเข้าใช้งาน</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSync ล้มเหลวในการเชื่อมต่อผ่านทางพร็อกซี่</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync ไม่สามารถค้นหาพร็อกซี่บนเซิร์ฟเวอร์ได้</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync ล้มเหลวในการยืนยันสิทธิ์การเข้าใช้งานที่เซิร์ฟเวอร์ %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync ล้มเหลวในการเชื่อมต่อกับเครือข่าย</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>เกิดข้อผิดพลาดเกี่ยวกับ HTTP transmission</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>CSync ล้มเหลว เนื่องจากไม่สามารถจัดการกับการปฏิเสธให้เข้าใช้งานได้</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>CSync ได้พยายามที่จะสร้างไดเร็กทอรี่ที่มีอยู่แล้ว</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: ไม่มีพื้นที่เหลือเพียงพอบนเซิร์ฟเวอร์ %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>CSync ไม่สามารถระบุข้อผิดพลาดได้</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation type="unfinished"/>
    </message>
@@ -482,17 +482,17 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>Dosya</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>Hesabınızdaki tüm dosyaların eşitlendiği klasör:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>Uzak yol: %1</translation>
    </message>
@@ -1114,7 +1114,7 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="153"/>
        <source>&amp;Next &gt;</source>
-        <translation>&amp;İleri &gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="233"/>
@@ -1876,255 +1876,250 @@ Kullanmanız önerilmez.</translation>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>Başarılı.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>CSync bir kilit dosyası oluşturamadı.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation>CSync, günlük dosyası yükleyemedi veya oluşturamadı. Lütfen yerel eşitleme dizininde okuma ve yazma izinleriniz olduğundan emin olun.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation>CSync günlük dosyasına yazamadı.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;Csync için %1 eklentisi yüklenemedi.&lt;br/&gt;Lütfen kurulumu doğrulayın!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>Bu istemci üzerinde sistem saati sunucudaki sistem saati ile farklı. Sunucu ve istemci makinelerde bir zaman eşitleme hizmeti (NTP) kullanırsanız zaman aynı kalır.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>CSync dosya sistemi türünü tespit edemedi.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync dahili ağaçları işlerken bir hata ile karşılaştı.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync bellek ayıramadı.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>CSync ciddi parametre hatası.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>CSync güncelleme süreç adımı başarısız.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSync uzlaştırma süreç adımı başarısız.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>CSync yayma süreç adımı başarısız.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Hedef dizin mevcut değil.&lt;/p&gt;&lt;p&gt;Lütfen eşitleme ayarını denetleyin.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>Bir uzak dosya yazılamıyor. Lütfen uzak erişimi denetleyin.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>Yerel dosya sistemine yazılamıyor. Lütfen izinleri kontrol edin.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSync bir vekil sunucu aracılığıyla bağlanırken hata oluştu.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync vekil sunucuda kimlik doğrulayamadı.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync bir vekil veya sunucu ararken başarısız oldu.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync %1 sunucusunda kimlik doğrularken başarısız oldu.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync ağa bağlanamadı.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation>Bir ağ zaman aşımı meydana geldi.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Bir HTTP aktarım hatası oluştu.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>CSync ele alınmayan izin reddinden dolayı başarısız.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation>CSync erişemedi:</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>CSync, zaten mevcut olan bir dizin oluşturmaya çalıştı.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: %1 sunucusunda kullanılabilir alan yok.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>CSync belirtilmemiş hata.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Kullanıcı tarafından iptal edildi</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation>Bağlanan dizin geçici olarak sunucuda kullanılamıyor</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation>%1 numaralı bir hata oluştu.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Bu öge önceki hatalar koşullarından dolayı eşitlenemiyor: %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Sembolik bağlantılar eşitlemede desteklenmiyor.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation>Sabit bağlantılar eşitlemede desteklenmemektedir.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation>Dosya yoksayma listesinde.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation>Dosya, çapraz platform arasında eşitlenemeyecek karakterler içeriyor.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation>Dosya adı kodlaması geçerli değil</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Bir eşitleme günlüğü başlatılamadı.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation>Eşitleme günlüğü açılamıyor</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>&quot;Eşitlenecekleri seçin&quot; kara listesinde olduğundan yoksayıldı.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Bu dizine alt dizin ekleme yetkiniz olmadığından izin verilmedi</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Üst dizin ekleme yetkiniz olmadığından izin verilmedi</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Bu dizine dosya ekleme yetkiniz olmadığından izin verilmedi</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Sunucuda salt okunur olduğundan, bu dosya yüklenemedi, geri alınıyor</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Kaldırmaya izin verilmedi, geri alınıyor</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation>Yerel dosyalar ve paylaşım klasörü kaldırıldı.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation>Taşımaya izin verilmedi, öge geri alındı</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>%1 salt okunur olduğundan taşımaya izin verilmedi</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation>hedef</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation>kaynak</translation>
    </message>
@@ -2142,17 +2137,17 @@ Kullanmanız önerilmez.</translation>
    <message>
        <location filename="../src/mirall/theme.cpp" line="234"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Sürüm %1. Daha fazla bilgi için lütfen &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt; adresini ziyaret edin.&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="238"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorparated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Telif Hakkı ownCloud Anonim Şirketi&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="239"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;%1 tarafından dağıtılmış ve GNU Genel Kamu Lisansı (GPL) Sürüm 2.0 ile lisanslanmıştır.&lt;br/&gt;%2 ve %2 logoları ABD ve/veya diğer ülkelerde %1 tescili markalarıdır.&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -37,7 +37,7 @@
    <message>
        <location filename="../src/mirall/folderwizardtargetpage.ui" line="140"/>
        <source>Create Folder</source>
-        <translation>Створити теку</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/folderwizardtargetpage.ui" line="160"/>
@@ -482,17 +482,17 @@ Are you sure you want to perform this operation?</source>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>Файл</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>Синхронізація усіх ваших файлів з </translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>Віддалений шлях: %1</translation>
    </message>
@@ -579,12 +579,12 @@ Are you sure you want to perform this operation?</source>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="257"/>
        <source>Create Remote Folder</source>
-        <translation>Створити Віддалену Теку</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="258"/>
        <source>Enter the name of the new folder to be created below &apos;%1&apos;:</source>
-        <translation>Введіть ім&apos;я нової теки, яка буде створена тут &apos;%1&apos;:</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/folderwizard.cpp" line="287"/>
@@ -1114,12 +1114,12 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="153"/>
        <source>&amp;Next &gt;</source>
-        <translation>&amp;Наступний&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="233"/>
        <source>&lt;p&gt;Could not connect securely:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Do you want to connect unencrypted instead (not recommended)?&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Не вдається підключитися через зашифроване з&apos;єднання:&lt;/p&gt;&lt;p&gt;%1&lt;/p&gt;&lt;p&gt;Ви хочете підключити в незашифроване з&apos;єднання (не рекомендується)?&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/wizard/owncloudsetuppage.cpp" line="234"/>
@@ -1878,255 +1878,250 @@ It is not advisable to use it.</source>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>Успішно.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>CSync не вдалося створити файл блокування.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation>CSync не зміг завантажити або створити файл протоколу. Перевірте, чи надано права на перегляд та запис до локальної теки.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation>CSync не зміг записати файл протоколу.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt; %1 плагін для синхронізації не вдалося завантажити.&lt;br/&gt;Будь ласка, перевірте його інсталяцію!&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>Системний час цього клієнта відрізняється від системного часу на сервері. Будь ласка, використовуйте сервіс синхронізації часу (NTP) на сервері та клієнті, аби час був однаковий.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>CSync не вдалося визначити тип файлової системи.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>У CSync виникла помилка під час сканування внутрішньої структури каталогів.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync не вдалося зарезервувати пам&apos;ять.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>У CSync сталася фатальна помилка параметра.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>CSync не вдалася зробити оновлення .</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSync не вдалася зробити врегулювання.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>CSync не вдалася зробити розповсюдження.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;Цільовий каталог не існує.&lt;/p&gt;&lt;p&gt;Будь ласка, перевірте налаштування синхронізації.&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>Не можливо проводити запис у віддалену файлову систему. Будь ласка, перевірте повноваження доступу.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>Не можливо проводити запис у локальну файлову систему. Будь ласка, перевірте повноваження.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSync не вдалося приєднатися через Проксі.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation>CSync не вдалося аутентифікуватися на проксі-сервері.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync не вдалося знайти Проксі або Сервер.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync не вдалося аутентифікуватися на %1 сервері.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync не вдалося приєднатися до мережі.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation>Час під&apos;єднання до мережі вичерпався.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>Сталася помилка передачі даних по HTTP.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>CSync завершився неуспішно через порушення прав доступу.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation>CSync не має доступу</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>CSync намагалася створити каталог, який вже існує.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync: на сервері %1 скінчилося місце.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>Невизначена помилка CSync.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>Перервано користувачем</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation>Змонтована тека тимчасово недоступна на сервері</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation>Виникла внутрішня помилка за номером %1.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation>Шлях не синхронізується через помилки: %1</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>Синхронізація символічних посилань не підтримується. </translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation>Синхронізація жорстких посилань не підтримується.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation>Файл присутній у списку ігноруємих.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation>Файл містить недопустимі символи, через це синхронізація між платформами неможлива.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation>Кодування файлу не припустиме</translation>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>Не вдалося ініціалізувати протокол синхронізації.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation>Не вдається відкрити протокол синхронізації</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation>Ігнорується через чорний список в &quot;обрати що синхронізувати&quot;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation>Не дозволено через відсутність прав на додавання підкаталогів в цій теці.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation>Не дозволено через відсутність прав на додавання батьківської теки.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation>Не дозволено через відсутність прав на додавання файлів в цю теку.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation>Не дозволено завантажувати цей файл, оскільки він має дозвіл лише на перегляд, відновлюємо</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation>Не дозволено видаляти, відновлюємо</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation>Локальні файли та теки в загальному доступі було видалено.</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation>Переміщення не дозволено, елемент відновлено </translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation>Переміщення не дозволено, оскільки %1 помічений тільки для перегляду</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation>призначення</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation>джерело</translation>
    </message>
@@ -2144,17 +2139,17 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/mirall/theme.cpp" line="234"/>
        <source>&lt;p&gt;Version %1. For more information please visit &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Версія %1. Для отримання більш детальної інформації, будь ласка, відвідайте &lt;a href=&apos;%2&apos;&gt;%3&lt;/a&gt;.&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="238"/>
        <source>&lt;p&gt;Copyright ownCloud, Incorparated&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Усі права захищені ownCloud, Incorparated&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/mirall/theme.cpp" line="239"/>
        <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Поширюється  через %1 і під ліцензією GNU General Public License (GPL) версії 2.0&lt;br/&gt;%2 логотип  %2 є зареєстрованими торговими марками %1 у Сполучених Штатах та інших країнах, або обох.&lt;/p&gt;</translation>
+        <translation type="unfinished"/>
    </message>
 </context>
 <context>
@@ -481,17 +481,17 @@ Are you sure you want to perform this operation?</source>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>文件</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation>同步所有的文件到你的帐户里通过</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>远程路径： %1</translation>
    </message>
@@ -1869,255 +1869,250 @@ It is not advisable to use it.</source>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>成功。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>CSync 无法创建文件锁。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation>Csync同步失败，请确定是否有本地同步目录的读写权</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation>CSync写日志文件失败</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;csync 的 %1 插件不能加载。&lt;br/&gt;请校验安装！&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>本客户端的系统时间和服务器的系统时间不一致。请在服务器和客户机上使用时间同步服务 (NTP)以让时间一致。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>CSync 无法检测文件系统类型。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync 在处理内部文件树时出错。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync 失败，内存不足。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>CSync 致命参数错误。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>CSync 处理步骤更新失败。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSync 处理步骤调和失败。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>CSync 处理步骤传播失败。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;目标目录不存在。&lt;/p&gt;&lt;p&gt;请检查同步设置。&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>远程文件不可写，请检查远程权限。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>本地文件系统不可写。请检查权限。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSync 未能通过代理连接。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync 无法查询代理或服务器。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync 于 %1 服务器认证失败。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync 联网失败。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation>网络连接超时。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>HTTP 传输错误。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>出于未处理的权限拒绝，CSync 失败。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation>访问 CSync 失败</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>CSync 尝试创建了已有的文件夹。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync：%1 服务器空间已满。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>CSync 未定义错误。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation>用户撤销</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation>符号链接不被同步支持。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation>文件在忽略列表中。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation>无法初始化同步日志</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation>无法打开同步日志</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation type="unfinished"/>
    </message>
@@ -479,17 +479,17 @@ Are you sure you want to perform this operation?</source>
    <name>Mirall::FolderStatusDelegate</name>
    <message>
        <location filename="../src/mirall/folderstatusmodel.cpp" line="95"/>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="264"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="251"/>
        <source>File</source>
        <translation>檔案</translation>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="218"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="205"/>
        <source>Syncing all files in your account with</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/folderstatusmodel.cpp" line="221"/>
+        <location filename="../src/mirall/folderstatusmodel.cpp" line="208"/>
        <source>Remote path: %1</source>
        <translation>遠端路徑: %1</translation>
    </message>
@@ -1863,255 +1863,250 @@ It is not advisable to use it.</source>
 <context>
    <name>Mirall::SyncEngine</name>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="89"/>
+        <location filename="../src/mirall/syncengine.cpp" line="88"/>
        <source>Success.</source>
        <translation>成功。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="92"/>
+        <location filename="../src/mirall/syncengine.cpp" line="91"/>
        <source>CSync failed to create a lock file.</source>
        <translation>CSync 無法建立文件鎖</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="95"/>
+        <location filename="../src/mirall/syncengine.cpp" line="94"/>
        <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync directory.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="99"/>
+        <location filename="../src/mirall/syncengine.cpp" line="98"/>
        <source>CSync failed to write the journal file.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="102"/>
+        <location filename="../src/mirall/syncengine.cpp" line="101"/>
        <source>&lt;p&gt;The %1 plugin for csync could not be loaded.&lt;br/&gt;Please verify the installation!&lt;/p&gt;</source>
        <translation>&lt;p&gt;用於csync的套件%1&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="105"/>
+        <location filename="../src/mirall/syncengine.cpp" line="104"/>
        <source>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.</source>
        <translation>本客戶端的系統時間和伺服器系統時間不一致,請在伺服器與客戶端上使用時間同步服務(NTP)讓時間保持一致</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="110"/>
+        <location filename="../src/mirall/syncengine.cpp" line="109"/>
        <source>CSync could not detect the filesystem type.</source>
        <translation>CSync 無法偵測檔案系統的類型</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="113"/>
+        <location filename="../src/mirall/syncengine.cpp" line="112"/>
        <source>CSync got an error while processing internal trees.</source>
        <translation>CSync 處理內部資料樹時發生錯誤</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="116"/>
+        <location filename="../src/mirall/syncengine.cpp" line="115"/>
        <source>CSync failed to reserve memory.</source>
        <translation>CSync 無法取得記憶體空間。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="119"/>
+        <location filename="../src/mirall/syncengine.cpp" line="118"/>
        <source>CSync fatal parameter error.</source>
        <translation>CSync 參數錯誤。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="122"/>
+        <location filename="../src/mirall/syncengine.cpp" line="121"/>
        <source>CSync processing step update failed.</source>
        <translation>CSync 處理步驟 &quot;update&quot; 失敗。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="125"/>
+        <location filename="../src/mirall/syncengine.cpp" line="124"/>
        <source>CSync processing step reconcile failed.</source>
        <translation>CSync 處理步驟 &quot;reconcile&quot; 失敗。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="128"/>
+        <location filename="../src/mirall/syncengine.cpp" line="127"/>
        <source>CSync processing step propagate failed.</source>
        <translation>CSync 處理步驟 &quot;propagate&quot; 失敗。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="131"/>
+        <location filename="../src/mirall/syncengine.cpp" line="130"/>
        <source>&lt;p&gt;The target directory does not exist.&lt;/p&gt;&lt;p&gt;Please check the sync setup.&lt;/p&gt;</source>
        <translation>&lt;p&gt;目標資料夾不存在&lt;/p&gt;&lt;p&gt;請檢查同步設定&lt;/p&gt;</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="135"/>
+        <location filename="../src/mirall/syncengine.cpp" line="134"/>
        <source>A remote file can not be written. Please check the remote access.</source>
        <translation>遠端檔案無法寫入，請確認遠端存取權限。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="139"/>
+        <location filename="../src/mirall/syncengine.cpp" line="138"/>
        <source>The local filesystem can not be written. Please check permissions.</source>
        <translation>本地檔案系統無法寫入，請確認權限。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="142"/>
+        <location filename="../src/mirall/syncengine.cpp" line="141"/>
        <source>CSync failed to connect through a proxy.</source>
        <translation>CSync 透過代理伺服器連線失敗。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="145"/>
+        <location filename="../src/mirall/syncengine.cpp" line="144"/>
        <source>CSync could not authenticate at the proxy.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="148"/>
+        <location filename="../src/mirall/syncengine.cpp" line="147"/>
        <source>CSync failed to lookup proxy or server.</source>
        <translation>CSync 查詢代理伺服器或伺服器失敗。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="151"/>
+        <location filename="../src/mirall/syncengine.cpp" line="150"/>
        <source>CSync failed to authenticate at the %1 server.</source>
        <translation>CSync 於伺服器 %1 認證失敗。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="154"/>
+        <location filename="../src/mirall/syncengine.cpp" line="153"/>
        <source>CSync failed to connect to the network.</source>
        <translation>CSync 無法連接到網路。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="157"/>
+        <location filename="../src/mirall/syncengine.cpp" line="156"/>
        <source>A network connection timeout happened.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="160"/>
+        <location filename="../src/mirall/syncengine.cpp" line="159"/>
        <source>A HTTP transmission error happened.</source>
        <translation>HTTP 傳輸錯誤。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="163"/>
+        <location filename="../src/mirall/syncengine.cpp" line="162"/>
        <source>CSync failed due to not handled permission deniend.</source>
        <translation>CSync 失敗，由於未處理的存取被拒。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="166"/>
+        <location filename="../src/mirall/syncengine.cpp" line="165"/>
        <source>CSync failed to access </source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="169"/>
+        <location filename="../src/mirall/syncengine.cpp" line="168"/>
        <source>CSync tried to create a directory that already exists.</source>
        <translation>CSync 試圖建立一個已經存在的目錄。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="172"/>
-        <location filename="../src/mirall/syncengine.cpp" line="175"/>
+        <location filename="../src/mirall/syncengine.cpp" line="171"/>
+        <location filename="../src/mirall/syncengine.cpp" line="174"/>
        <source>CSync: No space on %1 server available.</source>
        <translation>CSync：伺服器 %1 沒有可用空間。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="178"/>
+        <location filename="../src/mirall/syncengine.cpp" line="177"/>
        <source>CSync unspecified error.</source>
        <translation>CSync 未知的錯誤。</translation>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="181"/>
+        <location filename="../src/mirall/syncengine.cpp" line="180"/>
        <source>Aborted by the user</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="184"/>
+        <location filename="../src/mirall/syncengine.cpp" line="183"/>
        <source>The mounted directory is temporary not available on the server</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="187"/>
+        <location filename="../src/mirall/syncengine.cpp" line="186"/>
        <source>An internal error number %1 happened.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="246"/>
+        <location filename="../src/mirall/syncengine.cpp" line="245"/>
        <source>The item is not synced because of previous errors: %1</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="371"/>
+        <location filename="../src/mirall/syncengine.cpp" line="361"/>
        <source>Symbolic links are not supported in syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="374"/>
+        <location filename="../src/mirall/syncengine.cpp" line="364"/>
        <source>Hard links are not supported in syncing.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="377"/>
+        <location filename="../src/mirall/syncengine.cpp" line="367"/>
        <source>File is listed on the ignore list.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="380"/>
+        <location filename="../src/mirall/syncengine.cpp" line="370"/>
        <source>File contains invalid characters that can not be synced cross platform.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="397"/>
-        <source>Filename encoding is not valid</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="580"/>
+        <location filename="../src/mirall/syncengine.cpp" line="564"/>
        <source>Unable to initialize a sync journal.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="661"/>
+        <location filename="../src/mirall/syncengine.cpp" line="645"/>
        <source>Cannot open the sync journal</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="893"/>
-        <location filename="../src/mirall/syncengine.cpp" line="900"/>
+        <location filename="../src/mirall/syncengine.cpp" line="877"/>
+        <location filename="../src/mirall/syncengine.cpp" line="884"/>
        <source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="918"/>
+        <location filename="../src/mirall/syncengine.cpp" line="902"/>
        <source>Not allowed because you don&apos;t have permission to add sub-directories in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="924"/>
+        <location filename="../src/mirall/syncengine.cpp" line="908"/>
        <source>Not allowed because you don&apos;t have permission to add parent directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="931"/>
+        <location filename="../src/mirall/syncengine.cpp" line="915"/>
        <source>Not allowed because you don&apos;t have permission to add files in that directory</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="951"/>
+        <location filename="../src/mirall/syncengine.cpp" line="935"/>
        <source>Not allowed to upload this file because it is read-only on the server, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="968"/>
-        <location filename="../src/mirall/syncengine.cpp" line="988"/>
+        <location filename="../src/mirall/syncengine.cpp" line="952"/>
+        <location filename="../src/mirall/syncengine.cpp" line="972"/>
        <source>Not allowed to remove, restoring</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1003"/>
+        <location filename="../src/mirall/syncengine.cpp" line="987"/>
        <source>Local files and share folder removed.</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1058"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1042"/>
        <source>Move not allowed, item restored</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1067"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1051"/>
        <source>Move not allowed because %1 is read-only</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the destination</source>
        <translation type="unfinished"/>
    </message>
    <message>
-        <location filename="../src/mirall/syncengine.cpp" line="1068"/>
+        <location filename="../src/mirall/syncengine.cpp" line="1052"/>
        <source>the source</source>
        <translation type="unfinished"/>
    </message>
Autor	SHA1	Mensagem	Data
Daniel Molkentin	fbe772eb6e	Update 1.7 to build with Qt 5.4: - Add new QtWebkit dependencies - Remove dependency to merged accessibility module	2015-02-02 08:56:24 +01:00
Daniel Molkentin	9cbe8bf577	v1.7.1	2014-12-18 12:45:49 +01:00
Daniel Molkentin	c00aa9b17c	Amend and edit ChangeLog for 1.7.1	2014-12-18 12:45:12 +01:00