Merge branch 'master' into icon-name-fix

2024-11-23 13:35:58 +03:00 · 2018-09-10 14:08:35 +02:00 · 2018-09-10 14:08:35 +02:00 · 264b77c634
commit 264b77c634
parent e3d7c9f1ea 23d64dd3ac
59 changed files with 611 additions and 448 deletions
--- a/.tx/nextcloud.client-desktop/de_translation
+++ b/.tx/nextcloud.client-desktop/de_translation
@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3


 # Translations
-Comment[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
-Icon[de_DE]=@APPLICATION_EXECUTABLE@
-Name[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
-GenericName[de_DE]=Synchronisationsordner
+Comment[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
+Icon[de]=@APPLICATION_EXECUTABLE@
+Name[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation
+GenericName[de]=Synchronisationsordner
--- a/.tx/nextcloud.client-desktop/pl_translation
+++ b/.tx/nextcloud.client-desktop/pl_translation
@ -0,0 +1,204 @@
+[Desktop Entry]
+Categories=Utility;X-SuSE-SyncUtility;
+Type=Application
+Exec=@APPLICATION_EXECUTABLE@
+Name=@APPLICATION_NAME@ desktop sync client 
+Comment=@APPLICATION_NAME@ desktop synchronization client
+GenericName=Folder Sync
+Icon=@APPLICATION_EXECUTABLE@
+Keywords=@APPLICATION_NAME@;syncing;file;sharing;
+X-GNOME-Autostart-Delay=3
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+
+
+# Translations
+Comment[pl]=@APPLICATION_NAME@ desktopowy klient synchronizacji
+Icon[pl]=@APPLICATION_EXECUTABLE@
+Name[pl]=@APPLICATION_NAME@ desktopowy klient synchronizacji
+GenericName[pl]=Katalog synchronizacji
--- a/NextcloudCPack.cmake
+++ b/NextcloudCPack.cmake
@ -19,7 +19,7 @@ if(APPLE)
    set( CPACK_GENERATOR "DragNDrop" )
    set( CPACK_SOURCE_GENERATOR "")
    set( CPACK_PACKAGE_FILE_NAME ${APPLICATION_SHORTNAME}-${CPACK_PACKAGE_VERSION} )
-    set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/gui/ownCloud.icns)
+    set( CPACK_PACKAGE_ICON ${CMAKE_BINARY_DIR}/src/gui/${APPLICATION_ICON_NAME}.icns)

    set( CPACK_DMG_DS_STORE "${CMAKE_SOURCE_DIR}/admin/osx/DS_Store.in")
 #    set( CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_SOURCE_DIR}/admin/osx/DMGBackground.png" )
--- a/README.md
+++ b/README.md
@ -32,21 +32,21 @@ you want to install system wide you could use `/usr/local` or `/opt/nextcloud/`.
 ##### Linux

 ```
-$ cmake .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1
+$ cmake "-GVisual Studio 15 2017 Win64" .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1 -DQTKEYCHAIN_LIBRARY=/path-to-qt5keychain-folder/lib64/libqt5keychain.so -DQTKEYCHAIN_INCLUDE_DIR=/path-to-qt5keychain-folder/include/qt5keychain/ -DOPENSSL_ROOT_DIR=/path-to-openssl-folder/ -DOPENSSL_INCLUDE_DIR=path-to-openssl-folder/include -DOPENSSL_LIBRARIES=path-to-openssl-folder/lib
 $ make install
 ```

 ##### Windows

 ```
-$ cmake -G "Visual Studio 15 2017 Win64" .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1
+$ cmake -G "Visual Studio 15 2017 Win64" .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1 -DPng2Ico_EXECUTABLE=/path-to-install-png2ico/png2ico.exe  -DQTKEYCHAIN_LIBRARY=/path-to-qt5keychain-folder/lib/qt5keychain.lib -DQTKEYCHAIN_INCLUDE_DIR=/path-to-qt5keychain-folder/include/qt5keychain/ -DOPENSSL_ROOT_DIR=/path-to-openssl-folder/ -DOPENSSL_INCLUDE_DIR=path-to-openssl-folder/include -DOPENSSL_LIBRARIES=path-to-openssl-folder/lib
 $ cmake --build . --config Debug --target install
 ```

 ##### Mac OS

 ```
-$ cmake .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1
+$ cmake .. -DCMAKE_INSTALL_PREFIX=path-to-install-folder/ -DCMAKE_BUILD_TYPE=Debug -DNO_SHIBBOLETH=1 -DQTKEYCHAIN_LIBRARY=/path-to-qt5keychain-folder/lib/libqt5keychain.dylib -DQTKEYCHAIN_INCLUDE_DIR=/path-to-qt5keychain-folder/include/qt5keychain/ -DOPENSSL_ROOT_DIR=/path-to-openssl-folder/ -DOPENSSL_INCLUDE_DIR=path-to-openssl-folder/include -DOPENSSL_LIBRARIES=path-to-openssl-folder/lib
 $ make install
 ```

--- a/cmake/modules/AddAppIconMacro.cmake
+++ b/cmake/modules/AddAppIconMacro.cmake
@ -45,6 +45,9 @@ macro (KDE4_ADD_APP_ICON appsources pattern)
                if (fn MATCHES ".*128.*" )
                    list (APPEND _icons ${it})
                endif (fn MATCHES ".*128.*")
+                if (fn MATCHES ".*256.*" )
+                    list (APPEND _icons ${it})
+                endif (fn MATCHES ".*256.*")                
            endforeach (it)
            if (_icons)
                add_custom_command(OUTPUT ${_outfilename}.ico ${_outfilename}.rc
--- a/cmake/modules/ECMAddAppIcon.cmake
+++ b/cmake/modules/ECMAddAppIcon.cmake
@ -168,7 +168,8 @@ function(ecm_add_app_icon appsources)
                      ${icons_at_32px}
                      ${icons_at_48px}
                      ${icons_at_64px}
-                      ${icons_at_128px})
+                      ${icons_at_128px}
+                      ${icons_at_256px})
    if (NOT windows_icons)
        message(AUTHOR_WARNING "No icons suitable for use on Windows provided")
    endif()
--- a/cmake/modules/MacOSXBundleInfo.plist.in
+++ b/cmake/modules/MacOSXBundleInfo.plist.in
@ -11,7 +11,7 @@
        <key>CFBundleExecutable</key>
        <string>@APPLICATION_EXECUTABLE@</string>
        <key>CFBundleIconFile</key>
-        <string>ownCloud.icns</string>
+        <string>@APPLICATION_ICON_NAME@.icns</string>
        <key>CFBundleIdentifier</key>
        <string>@APPLICATION_REV_DOMAIN@</string>
        <key>CFBundleInfoDictionaryVersion</key>
--- a/src/cmd/cmd.cpp
+++ b/src/cmd/cmd.cpp
@ -319,7 +319,7 @@ int main(int argc, char **argv)
    options.trustSSL = false;
    options.useNetrc = false;
    options.interactive = true;
-    options.ignoreHiddenFiles = true;
+    options.ignoreHiddenFiles = false; // Default is to sync hidden files
    options.nonShib = false;
    options.restartTimes = 3;
    options.uplimit = 0;
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@ -272,7 +272,7 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
    add_executable( ${APPLICATION_EXECUTABLE} WIN32 main.cpp ${final_src})
 else()
    # set(CMAKE_INSTALL_PREFIX ".") # Examples use /Applications. hurmpf.
-    set(MACOSX_BUNDLE_ICON_FILE "ownCloud.icns")
+    set(MACOSX_BUNDLE_ICON_FILE "${APPLICATION_ICON_NAME}.icns")

    # we must add MACOSX_BUNDLE only if building a bundle
    add_executable( ${APPLICATION_EXECUTABLE} WIN32 MACOSX_BUNDLE main.cpp ${final_src})
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@ -680,7 +680,7 @@ void AccountSettings::slotFolderWizardAccepted()

    /* take the value from the definition of already existing folders. All folders have
     * the same setting so far.
-     * The default is to not sync hidden files
+     * The default is to sync hidden files
     */
    definition.ignoreHiddenFiles = folderMan->ignoreHiddenFiles();

--- a/src/gui/creds/webflowcredentials.cpp
+++ b/src/gui/creds/webflowcredentials.cpp
@ -24,6 +24,35 @@ namespace OCC {

 Q_LOGGING_CATEGORY(lcWebFlowCredentials, "sync.credentials.webflow", QtInfoMsg)

+class WebFlowCredentialsAccessManager : public AccessManager
+{
+public:
+    WebFlowCredentialsAccessManager(const WebFlowCredentials *cred, QObject *parent = nullptr)
+        : AccessManager(parent)
+        , _cred(cred)
+    {
+    }
+
+protected:
+    QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData) Q_DECL_OVERRIDE
+    {
+        QNetworkRequest req(request);
+        if (!req.attribute(HttpCredentials::DontAddCredentialsAttribute).toBool()) {
+            if (_cred && !_cred->password().isEmpty()) {
+                QByteArray credHash = QByteArray(_cred->user().toUtf8() + ":" + _cred->password().toUtf8()).toBase64();
+                req.setRawHeader("Authorization", "Basic " + credHash);
+            }
+        }
+
+        return AccessManager::createRequest(op, req, outgoingData);
+    }
+
+private:
+    // The credentials object dies along with the account, while the QNAM might
+    // outlive both.
+    QPointer<const WebFlowCredentials> _cred;
+};
+
 WebFlowCredentials::WebFlowCredentials()
    : _ready(false),
      _credentialsValid(false)
@ -56,7 +85,7 @@ QString WebFlowCredentials::password() const {

 QNetworkAccessManager *WebFlowCredentials::createQNAM() const {
    qCInfo(lcWebFlowCredentials()) << "Get QNAM";
-    AccessManager *qnam = new AccessManager();
+    AccessManager *qnam = new WebFlowCredentialsAccessManager(this);

    connect(qnam, &AccessManager::authenticationRequired, this, &WebFlowCredentials::slotAuthentication);
    connect(qnam, &AccessManager::finished, this, &WebFlowCredentials::slotFinished);
--- a/src/gui/folder.h
+++ b/src/gui/folder.h
@ -49,7 +49,7 @@ class FolderDefinition
 public:
    FolderDefinition()
        : paused(false)
-        , ignoreHiddenFiles(true)
+        , ignoreHiddenFiles(false)
    {
    }

--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@ -1372,8 +1372,10 @@ QString FolderMan::findGoodPathForNewSyncFolder(const QString &basePath, const Q
 bool FolderMan::ignoreHiddenFiles() const
 {
    if (_folderMap.empty()) {
-        return true;
+        // Currently no folders in the manager -> return default
+        return false;
    }
+    // Since the hiddenFiles settings is the same for all folders, just return the settings of the first folder
    return _folderMap.begin().value()->ignoreHiddenFiles();
 }

--- a/src/gui/owncloudgui.cpp
+++ b/src/gui/owncloudgui.cpp
@ -415,7 +415,7 @@ void ownCloudGui::addAccountContextMenu(AccountStatePtr accountState, QMenu *men
    menu->addSeparator();
    if (separateMenu) {
        if (onePaused) {
-            QAction *enable = menu->addAction(tr("Unpause all folders"));
+            QAction *enable = menu->addAction(tr("Resume all folders"));
            enable->setProperty(propertyAccountC, QVariant::fromValue(accountState));
            connect(enable, &QAction::triggered, this, &ownCloudGui::slotUnpauseAllFolders);
        }
@ -648,9 +648,9 @@ void ownCloudGui::updateContextMenu()
    if (atLeastOnePaused) {
        QString text;
        if (accountList.count() > 1) {
-            text = tr("Unpause all synchronization");
+            text = tr("Resume all synchronization");
        } else {
-            text = tr("Unpause synchronization");
+            text = tr("Resume synchronization");
        }
        QAction *action = _contextMenu->addAction(text);
        connect(action, &QAction::triggered, this, &ownCloudGui::slotUnpauseAllFolders);
--- a/src/gui/wizard/owncloudsetupnocredspage.ui
+++ b/src/gui/wizard/owncloudsetupnocredspage.ui
@ -61,22 +61,11 @@
      </spacer>
     </item>
     <item>
-      <widget class="QPushButton" name="hostButton">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="font">
-        <font>
-         <underline>true</underline>
-        </font>
-       </property>
+      <widget class="QLabel" name="installLink">
       <property name="text">
-        <string>Host your own server</string>
+        <string>&lt;a href=&quot;https://docs.nextcloud.com/server/13/admin_manual/installation/index.html#installation&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Host your own server&lt;/span&gt;&lt;/a&gt;</string>
       </property>
-       <property name="flat">
+       <property name="openExternalLinks">
        <bool>true</bool>
       </property>
      </widget>
--- a/src/gui/wizard/owncloudsetuppage.cpp
+++ b/src/gui/wizard/owncloudsetuppage.cpp
@ -97,7 +97,7 @@ OwncloudSetupPage::OwncloudSetupPage(QWidget *parent)
    _ui.slideImage->hide();
    _ui.slideLabel->hide();
    _ui.loginButton->hide();
-    _ui.hostButton->hide();
+    _ui.installLink->hide();
 #endif
    setStyleSheet(QString("background-color:%1; color:%2 QLabel { color:%2; } QSpacerItem { color: red; }").arg(theme->wizardHeaderBackgroundColor().name(), theme->wizardHeaderTitleColor().name()));
 }
--- a/src/gui/wizard/webview.ui
+++ b/src/gui/wizard/webview.ui
@ -11,7 +11,7 @@
   </rect>
  </property>
  <property name="sizePolicy">
-   <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+   <sizepolicy hsizetype="Minimum" vsizetype="MinimumExpanding">
    <horstretch>0</horstretch>
    <verstretch>0</verstretch>
   </sizepolicy>
--- a/translations/client_ca.ts
+++ b/translations/client_ca.ts
@ -767,7 +767,7 @@ Consulteu el registre per obtenir més informació.</numerusform></translation>
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
        <translation type="unfinished"/>
@ -3639,8 +3639,8 @@ No és aconsellada usar-la.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Reprén totes les carpetes</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3649,13 +3649,13 @@ No és aconsellada usar-la.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Reprèn totes les sincronitzacions</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Reprèn la sincronització</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@ -373,7 +373,7 @@
    <message>
        <location filename="../src/gui/accountstate.cpp" line="132"/>
        <source>Maintenance mode</source>
-        <translation>režim údržby</translation>
+        <translation>Režim údržby</translation>
    </message>
    <message>
        <location filename="../src/gui/accountstate.cpp" line="134"/>
@ -383,7 +383,7 @@
    <message>
        <location filename="../src/gui/accountstate.cpp" line="136"/>
        <source>Configuration error</source>
-        <translation>Chyba konfigurace</translation>
+        <translation>Chyba nastavení</translation>
    </message>
    <message>
        <location filename="../src/gui/accountstate.cpp" line="138"/>
@ -534,12 +534,12 @@
    <message>
        <location filename="../src/gui/addcertificatedialog.ui" line="51"/>
        <source>Browse...</source>
-        <translation>Procházet...</translation>
+        <translation>Procházet…</translation>
    </message>
    <message>
        <location filename="../src/gui/addcertificatedialog.ui" line="60"/>
        <source>Certificate password :</source>
-        <translation>Heslo certifikátu :</translation>
+        <translation>Heslo certifikátu:</translation>
    </message>
    <message>
        <location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
@ -764,12 +764,10 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>Všechny soubory v synchronizované složce &apos;%1&apos; byly na serveru smazány.
-Tyto soubory budou smazány i ve vaší místní synchronizované složce a nebudou tedy dostupné, pokud nemáte právo obnovovat. Rozhodnete-li se soubory ponechat, budou opět synchronizovány se serverem, pokud k tomu máte práva.
-Rozhodnete-li se soubory smazat, budou vám nedostupné, nejste-li jejich vlastníkem.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3642,8 +3640,8 @@ Nedoporučuje se jí používat.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Spustit všechny adresáře</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3652,13 +3650,13 @@ Nedoporučuje se jí používat.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Spustit veškerou synchronizaci</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Spustit synchronizaci</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@ -765,7 +765,7 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
        <translation>Alle Dateien im Synchronisationsordner &apos;%1&apos; wurden auf dem Server gelöscht.
@ -3643,8 +3643,8 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Setze alle Ordner fort</translation>
+        <source>Resume all folders</source>
+        <translation>Alle Ordner fortsetzen</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3653,13 +3653,13 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Setze gesamte Synchronisation fort</translation>
+        <source>Resume all synchronization</source>
+        <translation>Alle Synchronisierungen fortsetzen</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Setze Synchronisation fort</translation>
+        <source>Resume synchronization</source>
+        <translation>Synchronisation fortsetzen</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@ -765,13 +765,10 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>Όλα τα αρχεία στο φάκελο συγχρονισμού &apos;%1&apos; έχουν διαγραφεί στον διακομιστή.
-Αυτές οι διαγραφές θα συγχρονιστούν στον τοπικό σας φάκελο συγχρονισμού, κάνοντας τέτοιου είδους αρχεία μη διαθέσιμα, εκτός εάν έχετε δικαίωμα επαναφοράς. 
-Εάν αποφασίσετε να διατηρήσετε αυτά τα αρχεία, θα συγχρονιστούν εκ νέου με το διακομιστή, εφόσον έχετε δικαιώματα να το κάνετε.
-Εφόσον επιλέξετε να διαγράψετε τα αρχεία, δε θα είναι διαθέσιμα σε εσάς, εκτός εάν είστε ο ιδιοκτήτης τους.  </translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3644,8 +3641,8 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Αναίρεση παύσης όλων των φακέλων</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3654,13 +3651,13 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Αναίρεση παύσης όλων των συγχρονισμών</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Αναίρεση παύσης συγχρονσμού</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@ -792,7 +792,7 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder &apos;%1&apos; folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
        <translation type="unfinished"></translation>
@ -3661,7 +3661,7 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
+        <source>Resume all folders</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
@ -3671,12 +3671,12 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
+        <source>Resume all synchronization</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
+        <source>Resume synchronization</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
--- a/translations/client_en_GB.ts
+++ b/translations/client_en_GB.ts
@ -765,13 +765,10 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>All files in the sync folder &apos;%1&apos; folder were deleted on the server.
-These deletes will be synchronised to your local sync folder, making such files unavailable unless you have a right to restore. 
-If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
-If you decide to delete the files, they will be unavailable to you, unless you are the owner.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3644,8 +3641,8 @@ It is not advisable to use it.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Unpause all folders</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3654,13 +3651,13 @@ It is not advisable to use it.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Unpause all synchronisation</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Unpause synchronisation</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@ -37,7 +37,7 @@
    <message>
        <location filename="../src/gui/folderwizardtargetpage.ui" line="163"/>
        <source>Refresh</source>
-        <translation>Refrescar</translation>
+        <translation>Actualizar</translation>
    </message>
    <message>
        <location filename="../src/gui/folderwizardtargetpage.ui" line="177"/>
@ -70,7 +70,7 @@
    <message>
        <location filename="../src/gui/notificationwidget.ui" line="89"/>
        <source>TextLabel</source>
-        <translation>Etiqueta de texto</translation>
+        <translation>EtiquetaDeTexto</translation>
    </message>
 </context>
 <context>
@ -111,7 +111,7 @@
    <message>
        <location filename="../src/gui/accountsettings.ui" line="152"/>
        <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>Las carpetas no seleccionadas serán &lt;b&gt;eliminadas&lt;/b&gt; de su sistema de archivos local y ya no serán sincronizadas con este ordenador</translation>
+        <translation>Las carpetas no seleccionadas serán &lt;b&gt;eliminadas&lt;/b&gt; de su carpeta local y ya no serán sincronizadas en este ordenador</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.ui" line="198"/>
@ -228,7 +228,7 @@
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="650"/>
        <source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
-        <translation>La versión del servidor %1 es antigua, ¡y no está soportada! Si continúas, lo haces bajo tu propio riesgo.</translation>
+        <translation>¡La versión del servidor %1 es antigua y no está soportada! Si continúas, lo haces bajo tu propio riesgo.</translation>
    </message>
    <message>
        <location filename="../src/gui/accountsettings.cpp" line="652"/>
@ -446,7 +446,7 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="613"/>
        <source>The list of unsynced items has been copied to the clipboard.</source>
-        <translation>La lista de elementos sin sincronizar, ha sido copiada al portapapeles.</translation>
+        <translation>La lista de elementos sin sincronizar se ha copiado al portapapeles.</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="618"/>
@ -466,7 +466,7 @@
        <location filename="../src/gui/activitywidget.ui" line="68"/>
        <location filename="../src/gui/activitywidget.ui" line="94"/>
        <source>TextLabel</source>
-        <translation>Etiqueta de texto</translation>
+        <translation>EtiquetaDeTexto</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="131"/>
@ -496,12 +496,12 @@
    <message numerus="yes">
        <location filename="../src/gui/activitywidget.cpp" line="349"/>
        <source>You received %n new notification(s) from %2.</source>
-        <translation><numerusform>Ha recibido %n nueva notificación de %2.</numerusform><numerusform>Ha recibido %n nueva notificacióne(s) de %2.</numerusform></translation>
+        <translation><numerusform>Ha recibido %n nueva notificación de %2.</numerusform><numerusform>Ha recibido %n nueva notificación(es) de %2.</numerusform></translation>
    </message>
    <message numerus="yes">
        <location filename="../src/gui/activitywidget.cpp" line="356"/>
        <source>You received %n new notification(s) from %1 and %2.</source>
-        <translation><numerusform>Ha recibido %n nueva notificación de %1 y de %2.</numerusform><numerusform>Ha recibido %n nuevas notificacióne(s) de %1 y de %2.</numerusform></translation>
+        <translation><numerusform>Ha recibido %n nueva notificación de %1 y de %2.</numerusform><numerusform>Ha recibido %n nuevas notificación(es) de %1 y de %2.</numerusform></translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="358"/>
@ -611,12 +611,12 @@
    <message>
        <location filename="../src/libsync/connectionvalidator.cpp" line="310"/>
        <source>The configured server for this client is too old</source>
-        <translation>La configuración del servidor para este cliente está obsoleta</translation>
+        <translation>La configuración del servidor para este cliente es demasiado antigua</translation>
    </message>
    <message>
        <location filename="../src/libsync/connectionvalidator.cpp" line="311"/>
        <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 última versión del servidor y reinicie el cliente.</translation>
    </message>
    <message>
        <location filename="../src/libsync/connectionvalidator.cpp" line="172"/>
@ -652,7 +652,7 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="139"/>
        <source>%1 should be a folder but is not.</source>
-        <translation>%1 debería ser un directorio, pero no lo es.</translation>
+        <translation>%1 debería ser una carpeta, pero no lo es.</translation>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="142"/>
@ -721,7 +721,7 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="401"/>
        <source>%1 has a sync conflict. Please check the conflict file!</source>
-        <translation>Conflicto al sincronizar %1. Por favor compruebe el archivo!</translation>
+        <translation>Conflicto al sincronizar %1. ¡Por favor compruebe el archivo!</translation>
    </message>
    <message numerus="yes">
        <location filename="../src/gui/folder.cpp" line="406"/>
@ -765,13 +765,13 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>Todos los archivos en la carpeta %1 serán borrados en el servidor.
-Esto será sincronizado en su carpeta local, haciendo imposible su recuperación a menos que disponga de archivos de respaldo.
-Si decide mantener estos archivos, serán re-sincronizados con el servidor si dispone de permisos para ello.
-Si decide borrarlos, no serán visibles para usted a menos que sea el propietario.</translation>
+        <translation>Todos los archivos de la carpeta sincronizada &apos;% 1&apos; fueron eliminados del servidor.
+Estos archivos eliminados se sincronizarán con su carpeta local, por lo que no estarán disponibles a menos que tenga derecho a restaurarlos.
+Si decides conservar los archivos, se volverán a sincronizar con el servidor si tienes los derechos para hacerlo.
+Si decides eliminar los archivos, no estarán disponibles para ti, a menos que seas el propietario.</translation>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -802,7 +802,7 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados
        <source>This sync would reset the files to an earlier time in the sync folder '%1'.
 This might be because a backup was restored on the server.
 Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
-        <translation>Esta sincronización reseteará los archivos en la carpeta &apos;%1&apos; a una versión previa.
+        <translation>Esta sincronización restablecerá los archivos en la carpeta &apos;%1&apos; a una versión previa.
 Esto puede deberse a que una copia de seguridad fue restaurada en el servidor.
 Si continua con la sincronización todos los archivos serán remplazados por su versión previa. ¿Desea mantener los archivos locales en su versión actual como archivos en conflicto?</translation>
    </message>
@ -902,17 +902,17 @@ Si continua con la sincronización todos los archivos serán remplazados por su
    <message>
        <location filename="../src/gui/folderman.cpp" line="1315"/>
        <source>The selected path is not a folder!</source>
-        <translation>¡La ruta seleccionada no es un directorio!</translation>
+        <translation>¡La ruta seleccionada no es una carpeta!</translation>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1319"/>
        <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>¡No tiene permiso para escribir en la carpeta seleccionada!</translation>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1369"/>
        <source>The local folder %1 contains a symbolic link. The link target contains an already synced folder Please pick another one!</source>
-        <translation>El directorio local %1 es un enlace simbólico. El destino del enlace ya contiene un directorio usado en una conexión de sincronización de directorios. Por favor, elija otro.</translation>
+        <translation>La carpeta local %1 es un enlace simbólico. El destino del enlace ya contiene una carpeta usada en una conexión de sincronización de directorios. Por favor, elija otro.</translation>
    </message>
    <message>
        <location filename="../src/gui/folderman.cpp" line="1384"/>
@ -1090,7 +1090,7 @@ Si continua con la sincronización todos los archivos serán remplazados por su
    <message>
        <location filename="../src/gui/folderstatusmodel.cpp" line="1064"/>
        <source>Preparing to sync...</source>
-        <translation>Preparándose para sincronizar...</translation>
+        <translation>Preparando la sincronizarción..</translation>
    </message>
 </context>
 <context>
@ -1111,7 +1111,7 @@ Si continua con la sincronización todos los archivos serán remplazados por su
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="67"/>
        <source>Click to select a local folder to sync.</source>
-        <translation>Haga clic para seleccionar una carpeta local para sincronizar.</translation>
+        <translation>Haga clic para seleccionar una carpeta local que sincronizar.</translation>
    </message>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="72"/>
@ -1164,7 +1164,7 @@ Si continua con la sincronización todos los archivos serán remplazados por su
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="445"/>
        <source>This folder is already being synced.</source>
-        <translation>Este directorio ya se ha sincronizado.</translation>
+        <translation>Esta carpeta ya se ha sincronizado.</translation>
    </message>
    <message>
        <location filename="../src/gui/folderwizard.cpp" line="447"/>
@ -1190,12 +1190,12 @@ Si continua con la sincronización todos los archivos serán remplazados por su
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="183"/>
        <source>No E-Tag received from server, check Proxy/Gateway</source>
-        <translation>No se ha recibido ninguna e-tag del servidor, revise el proxy/puerta de enlace</translation>
+        <translation>No se ha recibido ninguna E-Tag del servidor, revise el proxy/puerta de enlace</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="190"/>
        <source>We received a different E-Tag for resuming. Retrying next time.</source>
-        <translation>Se ha recibido una e-tag distinta para reanudar. Se volverá a intentar.</translation>
+        <translation>Se ha recibido una E-Tag distinta para reanudar. Se volverá a intentar.</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="217"/>
@ -1498,7 +1498,7 @@ Los elementos cuya eliminación está permitida serán eliminados si impiden que
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="109"/>
        <source>Save the log file to a file on disk for debugging.</source>
-        <translation>Guardar el archivo de registro a un archivo en disco para depuración.</translation>
+        <translation>Guardar el registro en un archivo en el disco para su depuración.</translation>
    </message>
    <message>
        <location filename="../src/gui/logbrowser.cpp" line="198"/>
@ -1602,7 +1602,7 @@ Los elementos cuya eliminación está permitida serán eliminados si impiden que
    <message>
        <location filename="../src/gui/networksettings.ui" line="190"/>
        <source>Download Bandwidth</source>
-        <translation>Ancho de banda de descarga</translation>
+        <translation>Velocidad de descarga</translation>
    </message>
    <message>
        <location filename="../src/gui/networksettings.ui" line="196"/>
@ -1626,12 +1626,12 @@ Los elementos cuya eliminación está permitida serán eliminados si impiden que
        <location filename="../src/gui/networksettings.ui" line="250"/>
        <location filename="../src/gui/networksettings.ui" line="282"/>
        <source>Limit to 3/4 of estimated bandwidth</source>
-        <translation>Limitar a 3/4 de la banda ancha estimada</translation>
+        <translation>Limitar a 3/4 de la velocidad estimada</translation>
    </message>
    <message>
        <location filename="../src/gui/networksettings.ui" line="269"/>
        <source>Upload Bandwidth</source>
-        <translation>Ancho de banda para subidas</translation>
+        <translation>Velocidad de subida</translation>
    </message>
    <message>
        <location filename="../src/gui/networksettings.ui" line="253"/>
@ -1728,7 +1728,7 @@ Los elementos cuya eliminación está permitida serán eliminados si impiden que
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
        <source>New %1 Update Ready</source>
-        <translation>Nueva %1 actualización está lista</translation>
+        <translation>La nueva %1 actualización está lista</translation>
    </message>
    <message>
        <location filename="../src/gui/updater/ocupdater.cpp" line="104"/>
@ -1807,7 +1807,7 @@ for additional privileges during the process.</source>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
        <source>Sync the folder &apos;%1&apos;</source>
-        <translation>Sincronizar el directorio &apos;%1&apos;</translation>
+        <translation>Sincronizar la carpeta &apos;%1&apos;</translation>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="164"/>
@ -1955,12 +1955,12 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="398"/>
        <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
-        <translation>Acceso denegado por el servidor. Para verificar que usted tiene acceso, &lt;a href=&quot;%1&quot;&gt;haga clic aquí&lt;/a&gt; para acceder al servicio con su navegador.</translation>
+        <translation>Acceso denegado por el servidor. Para verificar que tiene acceso, &lt;a href=&quot;%1&quot;&gt;haga clic aquí&lt;/a&gt; para acceder al servicio desde el navegador.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="278"/>
        <source>Invalid URL</source>
-        <translation>URL inválida.</translation>
+        <translation>URL no válida.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
@ -2193,7 +2193,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="172"/>
        <source>could not create folder %1</source>
-        <translation>No se ha podido crear el directorio %1</translation>
+        <translation>No se ha podido crear la carpeta %1</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="184"/>
@ -2461,7 +2461,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/gui/proxyauthdialog.ui" line="74"/>
        <source>TextLabel</source>
-        <translation>Etiqueta de texto</translation>
+        <translation>EtiquetaDeTexto</translation>
    </message>
 </context>
 <context>
@ -2644,7 +2644,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="276"/>
        <source>TextLabel</source>
-        <translation>Etiqueta de texto</translation>
+        <translation>EtiquetaDeTexto</translation>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="139"/>
@ -2664,7 +2664,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="105"/>
        <source>Set &amp;expiration date</source>
-        <translation>Establecer fecha de v&amp;encimiento</translation>
+        <translation>Establecer fecha de &amp;vencimiento</translation>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.ui" line="156"/>
@ -2971,7 +2971,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/gui/sslbutton.cpp" line="109"/>
        <source>State/Province:</source>
-        <translation>Estado/provincia:</translation>
+        <translation>Estado/Provincia:</translation>
    </message>
    <message>
        <location filename="../src/gui/sslbutton.cpp" line="110"/>
@ -3211,7 +3211,7 @@ No se recomienda usarla.</translation>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="188"/>
        <source>Error while reading folder.</source>
-        <translation>Error al leer el directorio.</translation>
+        <translation>Error al leer la carpeta.</translation>
    </message>
    <message>
        <location filename="../src/libsync/syncengine.cpp" line="264"/>
@ -3643,7 +3643,7 @@ No se recomienda usarla.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
+        <source>Resume all folders</source>
        <translation>Reanudar todas las carpetas</translation>
    </message>
    <message>
@ -3653,12 +3653,12 @@ No se recomienda usarla.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
+        <source>Resume all synchronization</source>
        <translation>Reanudar toda la sincronización</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
+        <source>Resume synchronization</source>
        <translation>Reanudar la sincronización</translation>
    </message>
    <message>
--- a/translations/client_es_AR.ts
+++ b/translations/client_es_AR.ts
@ -763,7 +763,7 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
        <translation type="unfinished"/>
@ -3629,7 +3629,7 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
+        <source>Resume all folders</source>
        <translation type="unfinished"/>
    </message>
    <message>
@ -3639,12 +3639,12 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
+        <source>Resume all synchronization</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
+        <source>Resume synchronization</source>
        <translation type="unfinished"/>
    </message>
    <message>
--- a/translations/client_es_CL.ts
+++ b/translations/client_es_CL.ts
@ -765,13 +765,10 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>Todos los archivos en la carpeta de sincronizacion &apos;%1&apos; fueron borrados en el servidor.
-Este borrado se sincronizara a tu carpeta de sincronización local, haciendo que estos archivos no sean disponibles a menos que tengas privilegio para restaurar.
-Si decides mantener estos archivos, estos se re-sincronizaran con el servidor si tienes los privilegios para hacerlo.
-Si decides borrar los archivos, estos ya no estarán disponibles para ti, a menos que seas el dueño.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3645,8 +3642,8 @@ No es recomendable usarlo. </translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Despasuar todas las carpetas</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3655,13 +3652,13 @@ No es recomendable usarlo. </translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Despausar toda la sincronización</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Despausar la sincronización</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_es_CO.ts
+++ b/translations/client_es_CO.ts
@ -765,13 +765,10 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>Todos los archivos en la carpeta de sincronizacion &apos;%1&apos; fueron borrados en el servidor.
-Este borrado se sincronizara a tu carpeta de sincronización local, haciendo que estos archivos no sean disponibles a menos que tengas privilegio para restaurar.
-Si decides mantener estos archivos, estos se re-sincronizaran con el servidor si tienes los privilegios para hacerlo.
-Si decides borrar los archivos, estos ya no estarán disponibles para ti, a menos que seas el dueño.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3645,8 +3642,8 @@ No es recomendable usarlo. </translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Despasuar todas las carpetas</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3655,13 +3652,13 @@ No es recomendable usarlo. </translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Despausar toda la sincronización</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Despausar la sincronización</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_es_CR.ts
+++ b/translations/client_es_CR.ts
@ -765,13 +765,10 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>Todos los archivos en la carpeta de sincronizacion &apos;%1&apos; fueron borrados en el servidor.
-Este borrado se sincronizara a tu carpeta de sincronización local, haciendo que estos archivos no sean disponibles a menos que tengas privilegio para restaurar.
-Si decides mantener estos archivos, estos se re-sincronizaran con el servidor si tienes los privilegios para hacerlo.
-Si decides borrar los archivos, estos ya no estarán disponibles para ti, a menos que seas el dueño.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3645,8 +3642,8 @@ No es recomendable usarlo. </translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Despasuar todas las carpetas</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3655,13 +3652,13 @@ No es recomendable usarlo. </translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Despausar toda la sincronización</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Despausar la sincronización</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_es_DO.ts
+++ b/translations/client_es_DO.ts
@ -765,13 +765,10 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>Todos los archivos en la carpeta de sincronizacion &apos;%1&apos; fueron borrados en el servidor.
-Este borrado se sincronizara a tu carpeta de sincronización local, haciendo que estos archivos no sean disponibles a menos que tengas privilegio para restaurar.
-Si decides mantener estos archivos, estos se re-sincronizaran con el servidor si tienes los privilegios para hacerlo.
-Si decides borrar los archivos, estos ya no estarán disponibles para ti, a menos que seas el dueño.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3645,8 +3642,8 @@ No es recomendable usarlo. </translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Despasuar todas las carpetas</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3655,13 +3652,13 @@ No es recomendable usarlo. </translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Despausar toda la sincronización</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Despausar la sincronización</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_es_EC.ts
+++ b/translations/client_es_EC.ts
@ -765,13 +765,10 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>Todos los archivos en la carpeta de sincronizacion &apos;%1&apos; fueron borrados en el servidor.
-Este borrado se sincronizara a tu carpeta de sincronización local, haciendo que estos archivos no sean disponibles a menos que tengas privilegio para restaurar.
-Si decides mantener estos archivos, estos se re-sincronizaran con el servidor si tienes los privilegios para hacerlo.
-Si decides borrar los archivos, estos ya no estarán disponibles para ti, a menos que seas el dueño.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3645,8 +3642,8 @@ No es recomendable usarlo. </translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Despasuar todas las carpetas</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3655,13 +3652,13 @@ No es recomendable usarlo. </translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Despausar toda la sincronización</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Despausar la sincronización</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_es_GT.ts
+++ b/translations/client_es_GT.ts
@ -765,13 +765,10 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>Todos los archivos en la carpeta de sincronizacion &apos;%1&apos; fueron borrados en el servidor.
-Este borrado se sincronizara a tu carpeta de sincronización local, haciendo que estos archivos no sean disponibles a menos que tengas privilegio para restaurar.
-Si decides mantener estos archivos, estos se re-sincronizaran con el servidor si tienes los privilegios para hacerlo.
-Si decides borrar los archivos, estos ya no estarán disponibles para ti, a menos que seas el dueño.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3645,8 +3642,8 @@ No es recomendable usarlo. </translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Despasuar todas las carpetas</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3655,13 +3652,13 @@ No es recomendable usarlo. </translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Despausar toda la sincronización</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Despausar la sincronización</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_es_HN.ts
+++ b/translations/client_es_HN.ts
@ -765,13 +765,10 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>Todos los archivos en la carpeta de sincronizacion &apos;%1&apos; fueron borrados en el servidor.
-Este borrado se sincronizara a tu carpeta de sincronización local, haciendo que estos archivos no sean disponibles a menos que tengas privilegio para restaurar.
-Si decides mantener estos archivos, estos se re-sincronizaran con el servidor si tienes los privilegios para hacerlo.
-Si decides borrar los archivos, estos ya no estarán disponibles para ti, a menos que seas el dueño.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3645,8 +3642,8 @@ No es recomendable usarlo. </translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Despasuar todas las carpetas</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3655,13 +3652,13 @@ No es recomendable usarlo. </translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Despausar toda la sincronización</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Despausar la sincronización</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_es_MX.ts
+++ b/translations/client_es_MX.ts
@ -765,13 +765,10 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>Todos los archivos en la carpeta de sincronizacion &apos;%1&apos; fueron borrados en el servidor.
-Este borrado se sincronizara a tu carpeta de sincronización local, haciendo que estos archivos no sean disponibles a menos que tengas privilegio para restaurar.
-Si decides mantener estos archivos, estos se re-sincronizaran con el servidor si tienes los privilegios para hacerlo.
-Si decides borrar los archivos, estos ya no estarán disponibles para ti, a menos que seas el dueño.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3645,8 +3642,8 @@ No es recomendable usarlo. </translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Despasuar todas las carpetas</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3655,13 +3652,13 @@ No es recomendable usarlo. </translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Despausar toda la sincronización</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Despausar la sincronización</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_es_SV.ts
+++ b/translations/client_es_SV.ts
@ -765,13 +765,10 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>Todos los archivos en la carpeta de sincronizacion &apos;%1&apos; fueron borrados en el servidor.
-Este borrado se sincronizara a tu carpeta de sincronización local, haciendo que estos archivos no sean disponibles a menos que tengas privilegio para restaurar.
-Si decides mantener estos archivos, estos se re-sincronizaran con el servidor si tienes los privilegios para hacerlo.
-Si decides borrar los archivos, estos ya no estarán disponibles para ti, a menos que seas el dueño.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3645,8 +3642,8 @@ No es recomendable usarlo. </translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Despasuar todas las carpetas</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3655,13 +3652,13 @@ No es recomendable usarlo. </translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Despausar toda la sincronización</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Despausar la sincronización</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_et.ts
+++ b/translations/client_et.ts
@ -763,7 +763,7 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
        <translation type="unfinished"/>
@ -3632,7 +3632,7 @@ Selle kasutamine pole soovitatav.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
+        <source>Resume all folders</source>
        <translation type="unfinished"/>
    </message>
    <message>
@ -3642,12 +3642,12 @@ Selle kasutamine pole soovitatav.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
+        <source>Resume all synchronization</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
+        <source>Resume synchronization</source>
        <translation type="unfinished"/>
    </message>
    <message>
--- a/translations/client_eu.ts
+++ b/translations/client_eu.ts
@ -765,7 +765,7 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
        <translation type="unfinished"/>
@ -3634,7 +3634,7 @@ Ez da gomendagarria erabltzea.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
+        <source>Resume all folders</source>
        <translation type="unfinished"/>
    </message>
    <message>
@ -3644,12 +3644,12 @@ Ez da gomendagarria erabltzea.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
+        <source>Resume all synchronization</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
+        <source>Resume synchronization</source>
        <translation type="unfinished"/>
    </message>
    <message>
--- a/translations/client_fa.ts
+++ b/translations/client_fa.ts
@ -765,13 +765,10 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>تمامی پرونده های پوشه همگام ساز پوشه &apos;1%&apos; در سرور حذف شد.
-این حذف ها با پوشه همگام ساز محلی شما هماهنگ خواهند شد، ساخت چنین پرونده هایی در دسترس نیستند مگر اینکه حق بازگرداندن داشته باشید.
-اگر شما تصمیم بگیرید پرونده ها را نگهداری کنید، آن ها با سرور مجددا همگام سازی می شوند در صورتی که شما حق انجام آن را داشته باشید.
-اگر شما تصمیم بگیرید پرونده ها را حذف کنید، آن ها در دسترس شما نخواهند بود، مگر اینکه مالک باشید.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3641,8 +3638,8 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>شروع مجدد تمام پوشه‌ها</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3651,13 +3648,13 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>شروع مجدد تمام همگام سازی ها</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>شروع مجدد همگام سازی</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_fi.ts
+++ b/translations/client_fi.ts
@ -763,7 +763,7 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
        <translation type="unfinished"/>
@ -3634,7 +3634,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
+        <source>Resume all folders</source>
        <translation type="unfinished"/>
    </message>
    <message>
@ -3644,13 +3644,13 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Palauta kaikki synkronointi</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Palauta synkronointi</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@ -766,7 +766,7 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
        <translation>Tous les fichiers contenus dans le dossier synchronisé &apos;%1&apos; ont été supprimés du serveur.
@ -3646,8 +3646,8 @@ Il est déconseillé de l&apos;utiliser.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Relancer tous les dossiers </translation>
+        <source>Resume all folders</source>
+        <translation>Reprendre tous les dossiers</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3656,13 +3656,13 @@ Il est déconseillé de l&apos;utiliser.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Relancer toutes les synchronisations</translation>
+        <source>Resume all synchronization</source>
+        <translation>Reprendre toutes les synchronisations</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Relancer la synchronisation</translation>
+        <source>Resume synchronization</source>
+        <translation>Reprendre la synchronisation</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
@ -3847,7 +3847,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
    <message>
        <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="36"/>
        <source>Please switch to your browser to proceed.</source>
-        <translation>Merci de basculer vers votre navigateur pour poursuivre.</translation>
+        <translation>Merci de basculer vers votre navigateur pour terminer.</translation>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudoauthcredspage.ui" line="46"/>
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@ -763,7 +763,7 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
        <translation type="unfinished"/>
@ -3633,7 +3633,7 @@ Recomendámoslle que non o use.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
+        <source>Resume all folders</source>
        <translation type="unfinished"/>
    </message>
    <message>
@ -3643,12 +3643,12 @@ Recomendámoslle que non o use.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
+        <source>Resume all synchronization</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
+        <source>Resume synchronization</source>
        <translation type="unfinished"/>
    </message>
    <message>
--- a/translations/client_hu.ts
+++ b/translations/client_hu.ts
@ -765,13 +765,10 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>Az összes fájl a szinkronizálási mappában - %1 - törölve lett a kiszolgálón.
-Ezek a törlések szinkronizálódni fognak a helyi mappádban, elérhetetlenné téve ezeket a fájlokat kivéve ha van jogosultságod a visszaállításhoz.
-Ha úgy döntesz, hogy megtartod a fájlokat, azok újra lesznek szinkronizálva a szerverrel, ha van rá jogosultságod.
-Ha úgy döntesz, hogy letörlöd a fájlokat, elérhetetlenné válnak számodra, kivéve ha te vagy a tulajdonos.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3635,7 +3632,7 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
+        <source>Resume all folders</source>
        <translation type="unfinished"/>
    </message>
    <message>
@ -3645,12 +3642,12 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
+        <source>Resume all synchronization</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
+        <source>Resume synchronization</source>
        <translation type="unfinished"/>
    </message>
    <message>
--- a/translations/client_is.ts
+++ b/translations/client_is.ts
@ -774,7 +774,7 @@ nánari upplýsingar.</translation>
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
        <translation type="unfinished"/>
@ -3652,8 +3652,8 @@ Ekki er mælt með því að hún sé notuð.
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Taka allar möppur úr bið</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3662,13 +3662,13 @@ Ekki er mælt með því að hún sé notuð.
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Taka allar samstillingar úr bið</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Taka samstillingu úr bið</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@ -766,7 +766,7 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
        <translation>Tutti i file nella cartella di sincronizzazione &apos;%1&apos; sono stati eliminati sul server.
@ -3645,7 +3645,7 @@ Non è consigliabile utilizzarlo.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
+        <source>Resume all folders</source>
        <translation>Riprendi tutte le cartelle</translation>
    </message>
    <message>
@ -3655,12 +3655,12 @@ Non è consigliabile utilizzarlo.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
+        <source>Resume all synchronization</source>
        <translation>Riprendi tutte le sincronizzazioni</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
+        <source>Resume synchronization</source>
        <translation>Riprendi la sincronizzazione</translation>
    </message>
    <message>
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@ -765,13 +765,10 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>サーバー上のフォルダー &apos;%1&apos; 内に存在するすべてのファイルが削除されました。
-これらはローカルに存在する同期フォルダーにも適用され、復元する権利がない限り、ファイルは使用できなくなります。
-「ファイルを残す」を選択すると、復元可能な場合はサーバーと再同期されます。
-「すべてのファイルを削除」を選択すると、あなたが所有者でない限り、ファイルは使用できなくなります。</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3640,8 +3637,8 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>すべてのフォルダーの同期を再開</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3650,13 +3647,13 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>すべての同期を再開</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>同期を再開</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_nb_NO.ts
+++ b/translations/client_nb_NO.ts
@ -764,13 +764,10 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>Alle filene i synkroniseringsmappen &apos;%1&apos; ble slettet på serveren.
-Disse slettingene vil bli synkronisert til din lokale synkroniseringsmappe og gjøre filene utilgjengelige hvis du ikke har lov til å gjenopprette. 
-Hvis du velger å beholde filene, vil de bli synkronisert tilbake til serveren hvis du har lov til det.
-Hvis du velger å slette filene, blir de utilgjengelige for deg hvis du ikke er eieren av filen.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3643,8 +3640,8 @@ Det er ikke tilrådelig å bruke den.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Fortsett alle mapper</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3653,13 +3650,13 @@ Det er ikke tilrådelig å bruke den.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Fortsett all synkronisering</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Fortsett synkronisering</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@ -765,13 +765,10 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>Alle bestanden in de syncmap &apos;%1&apos; werden verwijderd van de server.
-Deze verwijderingen worden gesynchroniseerd naar uw lokale syncmap, waardoor deze bestanden niet meer beschikbaar zijn, tenzij u het recht hebt om ze te herstellen. 
-Als u de bestanden wilt behouden, worden ze opnieuw gesynchroniseerd met de server als u die autorisatie hebt.
-Als u de bestanden wilt verwijderen, worden ze niet beschikbaar, tenzij u de eigenaar bent.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3648,8 +3645,8 @@ We adviseren deze site niet te gebruiken.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Hervat alle mappen</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3658,13 +3655,13 @@ We adviseren deze site niet te gebruiken.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Hervat alle synchronisatie</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Hervat synchronisatie</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@ -765,13 +765,10 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>Wszystkie pliki z folderu &apos;%1&apos; zostały usunięte z serwera.
-W momencie synchronizacji zostaną usunięte z lokalnego katalogu, co spowoduje ich niedostępność, chyba, że posiadasz prawo do przywracania.
-Jeśli zdecydujesz się zatrzymać pliki i posiadasz odpowiednie uprawnienia, zostaną one ponownie przesłane na serwer.
-Jeśli zdecydujesz je usunąć, nie będą więcej dostępne. </translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3640,8 +3637,8 @@ Niezalecane jest jego użycie.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Wznów wszystkie katalogi</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3650,13 +3647,13 @@ Niezalecane jest jego użycie.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Wznów wszystkie synchronizacje</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Wznów synchronizację</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@ -765,13 +765,10 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>Todos os ficheiros na pasta sincronizada &apos;%1&apos; foram apagados do servidor.
-Estas deleções irão ser sincronizadas para a sua pasta local de sincronização, fazendo com que os ficheiros fiquem indisponíveis, a não ser que tenha permissões para restaurar os mesmos . 
-Se decidir manter os ficheiros, eles serão sincronizados novamento para o servidor se tiver permissões para tal.
-Se decidir apagar os ficheiros, eles ficaram indisponíveis para si, a não ser que seja o seu proprietário.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3644,8 +3641,8 @@ Não é aconselhada a sua utilização.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Continuar todas as pastas</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3654,13 +3651,13 @@ Não é aconselhada a sua utilização.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Continuar toda a sincronização</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Continuar sincronização</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@ -765,13 +765,13 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>Todos os arquivos na pasta &apos;%1&apos; foram excluídos no servidor. 
-Essas exclusões serão sincronizadas com a pasta de sincronização local, tornando esses arquivos indisponíveis, a menos que você tenha o direito de restaurar. 
-Se você decidir manter os arquivos, eles serão ressincronizados com o servidor se você tiver direitos para fazê-lo. 
-Se decidir excluir os arquivos, eles não estarão disponíveis para você, a menos que você seja o proprietário.</translation>
+        <translation>Todos os arquivos na pasta de sincronização &apos;% 1&apos; foram excluídos do servidor.
+Essas exclusões serão sincronizadas com sua pasta local, tornando esses arquivos indisponíveis, a menos que você tenha o direito de restaurá-los.
+Se decidir manter os arquivos, eles serão re-sincronizados com o servidor se você tiver direitos para fazê-lo.
+Se decidir excluir os arquivos, eles ficarão indisponíveis, a menos que você seja o proprietário.</translation>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3644,7 +3644,7 @@ Não é aconselhável usá-la.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
+        <source>Resume all folders</source>
        <translation>Retomar todas as pastas</translation>
    </message>
    <message>
@ -3654,13 +3654,13 @@ Não é aconselhável usá-la.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
+        <source>Resume all synchronization</source>
        <translation>Retomar todas as sincronizações</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Retomar sincronização</translation>
+        <source>Resume synchronization</source>
+        <translation>Retomar a sincronização</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@ -415,7 +415,7 @@
        <location filename="../src/gui/activitywidget.cpp" line="515"/>
        <location filename="../src/gui/activitywidget.cpp" line="563"/>
        <source>Server Activity</source>
-        <translation>Действия Сервера</translation>
+        <translation>События на сервере</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="522"/>
@ -436,7 +436,7 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="606"/>
        <source>The server activity list has been copied to the clipboard.</source>
-        <translation>Список активности сервера скопирован в буфер обмена.</translation>
+        <translation>Список событий на сервере скопирован в буфер обмена.</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="610"/>
@ -471,7 +471,7 @@
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="131"/>
        <source>Server Activities</source>
-        <translation>Действия Сервера</translation>
+        <translation>События на сервере</translation>
    </message>
    <message>
        <location filename="../src/gui/activitywidget.cpp" line="87"/>
@ -765,22 +765,22 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>Все фйлы в синхронизируемом каталоге &apos;%1&apos; были удалены на сервере.
-Эти удаления будут переданы в ваш локальный синхронизируемый каталог, так что файлы станут недоступны, если только у вас нет права на восстановление. 
-Если вы решите сохранить эти файлы, то они будут повторно синхронизированы с сервером, при наличии у вас прав на это.
-Если вы решили удалить файлы, они станут вам недоступны, крмое случая, когда вы сам владелец.</translation>
+        <translation>На сервере удалены все файлы из синхронизируемого каталога «%1».
+При синхронизации будет выполнено удаление локальной копии файлов, что сделает их недоступными при отсутствии прав на восстановление удалённых файлов.
+При выборе «Сохранить файлы» и наличии соответствующих прав доступа, файлы будут повторно переданы на сервер.
+При выборе «Удалить файлы»,  файлы станут недоступны, кроме случая, когда вы являетесь их владельцем.</translation>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
        <source>All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored.
 Are you sure you want to sync those actions with the server?
 If this was an accident and you decide to keep your files, they will be re-synced from the server.</source>
-        <translation>Все файлы в локальном синхронизируемом каталоге &apos;%1&apos; были удалены. Эти удаления будут отправлены на ваш сервер, сделав таким образом файлы совсем недоступными, если только не восстанавливать их из резервной копии.
-Вы уверены, что хотите засинхронизировать сервер со всеми этими изменениями?
-Если это произошло случайно и вы решите сохранить файлы, они будут перезакачаны с сервера.</translation>
+        <translation>Все файлы в локальном синхронизируемом каталоге «%1» удалены. Информация об удалении будет отправлена на сервер, таким образом сделав файлы недоступными, если только не восстанавливать их из резервной копии.
+Действительно выполнить синхронизировать с этими изменениями?
+Если это произошло случайно, и вы решите сохранить файлы, они будут повторно скачаны с сервера.</translation>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="936"/>
@ -1639,7 +1639,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
    <message>
        <location filename="../src/gui/networksettings.cpp" line="34"/>
        <source>Hostname of proxy server</source>
-        <translation>Адрес прокси сервера</translation>
+        <translation>Адрес прокси-сервера</translation>
    </message>
    <message>
        <location filename="../src/gui/networksettings.cpp" line="35"/>
@ -2055,7 +2055,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="585"/>
        <source>Folder rename failed</source>
-        <translation>Ошибка переименования каталога</translation>
+        <translation>Ошибка переименования папки</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudsetupwizard.cpp" line="586"/>
@ -2091,12 +2091,12 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/wizard/owncloudwizardresultpage.cpp" line="40"/>
        <source>Open Local Folder</source>
-        <translation>Открыть локальный каталог</translation>
+        <translation>Открыть локальную папку</translation>
    </message>
    <message>
        <location filename="../src/gui/wizard/owncloudwizardresultpage.cpp" line="48"/>
        <source>Open %1 in Browser</source>
-        <translation>Открыть %1 в Браузере</translation>
+        <translation>Открыть «%1» в браузере</translation>
    </message>
 </context>
 <context>
@ -2120,7 +2120,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="409"/>
        <source>File %1 can not be downloaded because of a local file name clash!</source>
-        <translation>Файл %1 не может быть загружен из-за локального конфликта имен!</translation>
+        <translation>Файл «%1» не может быть загружен из-за локального конфликта имён!</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="459"/>
@ -2135,7 +2135,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="577"/>
        <source>File was deleted from server</source>
-        <translation>Файл был удален с сервера</translation>
+        <translation>Файл удалён с сервера</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="630"/>
@ -2150,7 +2150,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="798"/>
        <source>File %1 cannot be saved because of a local file name clash!</source>
-        <translation>Файл %1 не может быть сохранён из-за локального конфликта имен!</translation>
+        <translation>Файл «%1» не может быть сохранён из-за локального конфликта имён!</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatedownload.cpp" line="846"/>
@ -2181,7 +2181,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="158"/>
        <source>could not delete file %1, error: %2</source>
-        <translation>не удалось удалить файл %1, ошибка: %2</translation>
+        <translation>не удалось удалить файл «%1», ошибка: %2</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="166"/>
@ -2191,7 +2191,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="172"/>
        <source>could not create folder %1</source>
-        <translation>не удается создать папку %1</translation>
+        <translation>не удалось создать папку «%1»</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="184"/>
@ -2204,17 +2204,17 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="76"/>
        <source>Error removing &apos;%1&apos;: %2;</source>
-        <translation>Ошибка при удалении &apos;%1&apos;: %2; </translation>
+        <translation>Ошибка удаления «%1»: %2; </translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="101"/>
        <source>Could not remove folder &apos;%1&apos;</source>
-        <translation>Не удается удалить папку &apos;%1&apos;</translation>
+        <translation>Не удалось удалить папку «%1»</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="120"/>
        <source>Could not remove %1 because of a local file name clash</source>
-        <translation>Не удается удалить %1 из-за локального конфликта имен</translation>
+        <translation>Не удалось удалить «%1» из-за локального конфликта имён</translation>
    </message>
 </context>
 <context>
@ -2222,7 +2222,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="219"/>
        <source>File %1 can not be renamed to %2 because of a local file name clash</source>
-        <translation>Файл %1 не может быть переименован в %2 из-за локального конфликта имен</translation>
+        <translation>Файл «%1» не может быть переименован в «%2» из-за локального конфликта имён</translation>
    </message>
    <message>
        <location filename="../src/libsync/propagatorjobs.cpp" line="250"/>
@ -2698,7 +2698,7 @@ It is not advisable to use it.</source>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="414"/>
        <source>Password Protected</source>
-        <translation>Защищено Паролем</translation>
+        <translation>Защищено паролем</translation>
    </message>
    <message>
        <location filename="../src/gui/sharelinkwidget.cpp" line="96"/>
@ -3641,8 +3641,8 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Снять с паузы все папки</translation>
+        <source>Resume all folders</source>
+        <translation>Возобновить синхронизацию всех папок</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3651,12 +3651,12 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
+        <source>Resume all synchronization</source>
        <translation>Возобновить все синхронизации</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
+        <source>Resume synchronization</source>
        <translation>Возобновить синхронизацию</translation>
    </message>
    <message>
--- a/translations/client_sk.ts
+++ b/translations/client_sk.ts
@ -765,7 +765,7 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
        <translation type="unfinished"/>
@ -3635,8 +3635,8 @@ Nie je vhodné ju používať.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Zrušiť pozastavenie všetkých priečinkov</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3645,13 +3645,13 @@ Nie je vhodné ju používať.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Zrušiť pozastavenie všetkej synchronizácie</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Zrušiť pozastavenie synchronizácie</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@ -765,13 +765,10 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>Vse datoteke v usklajevani mapi »%1« so bile na strežniku izbrisane.
-Sprememba bo usklajena tudi s krajevno mapo na disku, zato bodo te datoteke, če ni ustreznih dovoljenj za obnovitev, izgubljene. 
-V kolikor se odločite te datoteke ohraniti, in so na voljo ustrezna dovoljenja, bodo spet usklajene s strežnikom.
-Nasprotno, če potrdite izbris in niste lastnik datotek, te ne bodo več na voljo.</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3644,8 +3641,8 @@ Uporaba ni priporočljiva.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Nadaljuj usklajevanje vseh map</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3654,13 +3651,13 @@ Uporaba ni priporočljiva.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Nadaljuj usklajevanje vsega</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Nadaljuj usklajevanje</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_sr.ts
+++ b/translations/client_sr.ts
@ -765,7 +765,7 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
        <translation type="unfinished"/>
@ -3635,7 +3635,7 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
+        <source>Resume all folders</source>
        <translation type="unfinished"/>
    </message>
    <message>
@ -3645,12 +3645,12 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
+        <source>Resume all synchronization</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
+        <source>Resume synchronization</source>
        <translation type="unfinished"/>
    </message>
    <message>
--- a/translations/client_sv.ts
+++ b/translations/client_sv.ts
@ -765,7 +765,7 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
        <translation type="unfinished"/>
@ -3639,8 +3639,8 @@ Det är inte lämpligt använda den.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>Sluta pausa alla mappar</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3649,13 +3649,13 @@ Det är inte lämpligt använda den.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>Sluta pausa all synkroinisering</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>Sluta pausa synkronisering</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@ -765,13 +765,10 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>ไฟล์ทั้งหมดในโฟลเดอร์ &apos;%1&apos; ที่ประสานข้อมูลเอาไว้ในเซิฟเวอร์จะถูกลบด้วย
-การลบข้อมูลนี้จะถูกประสานข้อมูลกับโฟลเดอร์ต้นทาง ทำให้ไฟล์ดังกล่าวไม่สามารถใช้งานได้จนกว่าจะถูกกู้คืน
-ถ้าคุณตัดสินใจที่จะเก็บไฟล์เอาไว้ ไฟล์ของคุณก็จะถูกประสานข้อมูลใหม่อีกครั้ง
-หากคุณตัดสินใจที่จะลบไฟล์ก็จะทำให้ไม่มีใครสามารถใช้งานโฟลเดอร์นี้ได้เพราะคุณเป็นเจ้าของ</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3644,8 +3641,8 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>ทำโฟลเดอร์ทั้งหมดต่อ</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3654,13 +3651,13 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>ประสานข้อมูลทั้งหมดต่อ</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>ประสานข้อมูลต่อ</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@ -765,13 +765,13 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
        <translation>&apos;%1&apos; eşitleme klasöründeki tüm dosyalar sunucudan silindi.
 Silinen dosyalar eşitleme sırasında yerel eşitleme klasörünüzden de silinecek ve bu dosyaları geri yüklemeyeceksiniz.
 Dosyaları korumayı seçerseniz, yeterli izinlerinizin olması durumunda dosyalar sunucu ile yeniden eşitlenecek.
-Dosyaları silmeyi seçerseniz, dosyaların sahibi değilseniz göremeyeceksiniz.</translation>
+Dosyaları silmeyi seçerseniz, dosyaların sahibi değilseniz daha sonra göremeyeceksiniz.</translation>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3645,7 +3645,7 @@ Kullanmanız önerilmez.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
+        <source>Resume all folders</source>
        <translation>Tüm klasörleri sürdür</translation>
    </message>
    <message>
@ -3655,12 +3655,12 @@ Kullanmanız önerilmez.</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
+        <source>Resume all synchronization</source>
        <translation>Tüm eşitlemeleri sürdür</translation>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
+        <source>Resume synchronization</source>
        <translation>Eşitlemeyi sürdür</translation>
    </message>
    <message>
--- a/translations/client_uk.ts
+++ b/translations/client_uk.ts
@ -763,7 +763,7 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
        <translation type="unfinished"/>
@ -3632,7 +3632,7 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
+        <source>Resume all folders</source>
        <translation type="unfinished"/>
    </message>
    <message>
@ -3642,12 +3642,12 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
+        <source>Resume all synchronization</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
+        <source>Resume synchronization</source>
        <translation type="unfinished"/>
    </message>
    <message>
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@ -765,13 +765,10 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
-        <translation>同步文件夹&apos;%1&apos;的所有文件已经在服务器端删除。
-删除动作会被同步到本地的同步文件夹，内部的文件将不可用，您需要有相应权限来恢复。
-如果您想保留这些文件，同时您有相应权限的话，它们将被重新同步到服务器。
-如果您决定删除这些文件，它们将不再可用，除非您是其所有者。</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/folder.cpp" line="932"/>
@ -3643,8 +3640,8 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
-        <translation>解除暂停所有文件夹</translation>
+        <source>Resume all folders</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="365"/>
@ -3653,13 +3650,13 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
-        <translation>解除暂停所有同步</translation>
+        <source>Resume all synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
-        <translation>解除暂停同步</translation>
+        <source>Resume synchronization</source>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="609"/>
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@ -763,7 +763,7 @@
    <message>
        <location filename="../src/gui/folder.cpp" line="927"/>
        <source>All files in the sync folder '%1' folder were deleted on the server.
-These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. 
+These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore.
 If you decide to keep the files, they will be re-synced with the server if you have rights to do so.
 If you decide to delete the files, they will be unavailable to you, unless you are the owner.</source>
        <translation type="unfinished"/>
@ -3635,7 +3635,7 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="360"/>
-        <source>Unpause all folders</source>
+        <source>Resume all folders</source>
        <translation type="unfinished"/>
    </message>
    <message>
@ -3645,12 +3645,12 @@ It is not advisable to use it.</source>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="599"/>
-        <source>Unpause all synchronization</source>
+        <source>Resume all synchronization</source>
        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../src/gui/owncloudgui.cpp" line="601"/>
-        <source>Unpause synchronization</source>
+        <source>Resume synchronization</source>
        <translation type="unfinished"/>
    </message>
    <message>