diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ff58de73..da6d004e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -165,13 +165,13 @@ endif() find_package(Sphinx) find_package(PdfLatex) - find_package(SQLite3 3.8.0 REQUIRED) # On some OS, we want to use our own, not the system sqlite if (USE_OUR_OWN_SQLITE3) include_directories(BEFORE ${SQLITE3_INCLUDE_DIR}) endif() +find_package(ZLIB) configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) diff --git a/ChangeLog b/ChangeLog index d4f100a01..12ee2c4a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,36 @@ ChangeLog ========= +version 1.8.2 (release 2015-05-xx) + * HTTP: Add the branding name to the UserAgent string. + * ConnectonValidator: Always run with new credentials. (#3266) + * Recall Feature: Admins can trigger an upload of a file from + client to server again + * Propagator: Add 'Content-Length: 0' header to MKCOL request + * Switch on checksum verification through branding or config + * Add ability for checksum verification of up and download + * Fix opening external links for some labels (#3135) + * AccountState: Run only a single validator, allow error message + overriding (#3236 #3153) + * SyncJournalDB: Minor fixes and simplificatons + * SyncEngine: Force re-read of folder Etags for upgrades from + 1.8.0 and 1.8.1 + * Propagator: Limit length of temporary file name #2789 + * ShareDialog: Password ui fixes. #3189 + * Fix startup hang by removing QSettings lock file. (#3175) + * Wizard: Allow SSL cert dialog to show twice. (#3168) + * ProtocolWidget: Fix rename message. (#3210) + * Discovery: Test better, treat invalid hrefs as error (#3176) + * Propagator: Overwrite local data only if unchanged. (#3156) + * ShareDialog: Improve error reporting for share API fails + * OSX Updater: Only allow if in /Applications (#2931) + * Wizard: Fix lock icon (#1447) + * Fix compile with gcc 5 + * Treat any 503 error as temporary (#3113) + * Work around for the Qt PUT corruption bug (#2425) + * OSX Shell integration: Optimizations + * Windows Shell integration: Optimizations + .. more than 250 commits since 1.8.1 + version 1.8.1 (release 2015-05-07) * Make "operation canceled" error a soft error * Do not throw an error for files that are scheduled to be removed, diff --git a/admin/win/nsi/l10n/.tx/config b/admin/win/nsi/l10n/.tx/config index 8c3c1f4b0..20ffbce06 100644 --- a/admin/win/nsi/l10n/.tx/config +++ b/admin/win/nsi/l10n/.tx/config @@ -10,24 +10,25 @@ minimum_perc = 5 # simple one-to-one language mappings trans.ca = pofiles/ca.po -trans.el = pofiles/el.po -trans.es = pofiles/es.po -trans.es_AR = pofiles/es_AR.po -trans.eu = pofiles/eu.po -trans.fa = pofiles/fa.po -trans.fr = pofiles/fr.po -trans.gl = pofiles/gl.po -trans.it = pofiles/it.po -trans.nl = pofiles/nl.po -trans.pl = pofiles/pl.po -trans.pt_BR = pofiles/pt_BR.po -trans.ru = pofiles/ru.po +trans.el = pofiles/el.po +trans.es_AR = pofiles/es_AR.po +trans.es = pofiles/es.po +trans.eu = pofiles/eu.po +trans.fa = pofiles/fa.po +trans.fr = pofiles/fr.po +trans.gl = pofiles/gl.po +trans.it = pofiles/it.po +trans.nb_NO = pofiles/nb_NO.po +trans.nl = pofiles/nl.po +trans.pl = pofiles/pl.po +trans.pt_BR = pofiles/pt_BR.po +trans.ru = pofiles/ru.po trans.sl = pofiles/sl.po trans.sv = pofiles/sv.po trans.tr = pofiles/tr.po -trans.uk = pofiles/uk.po -trans.zh_TW = pofiles/zh_TW.po -trans.zh_CN = pofiles/zh_CN.po +trans.uk = pofiles/uk.po +trans.zh_CN = pofiles/zh_CN.po +trans.zh_TW = pofiles/zh_TW.po # special handling below @@ -35,14 +36,13 @@ trans.zh_CN = pofiles/zh_CN.po trans.de_DE = pofiles/de.po # choose one of the given translations on transifex as default -trans.pt_PT = pofiles/pt.po +trans.pt_PT = pofiles/pt.po # choose a special language as more generic default -trans.cs_CZ = pofiles/cs.po -trans.et_EE = pofiles/et.po -trans.fi_FI = pofiles/fi.po -trans.ja_JP = pofiles/ja.po -trans.hu_HU = pofiles/hu.po -trans.sk_SK = pofiles/sk.po -trans.th_TH = pofiles/th.po - +trans.cs_CZ = pofiles/cs.po +trans.et_EE = pofiles/et.po +trans.fi_FI = pofiles/fi.po +trans.hu_HU = pofiles/hu.po +trans.ja_JP = pofiles/ja.po +trans.sk_SK = pofiles/sk.po +trans.th_TH = pofiles/th.po diff --git a/admin/win/nsi/l10n/Norwegian.nsh b/admin/win/nsi/l10n/Norwegian.nsh new file mode 100644 index 000000000..745dc22e6 --- /dev/null +++ b/admin/win/nsi/l10n/Norwegian.nsh @@ -0,0 +1,46 @@ +# Auto-generated - do not modify +StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Vis versjonsmerknader" +StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Fant ${APPLICATION_EXECUTABLE}-prosess(er) som m stoppes.$\nVil du at installasjonsprogrammet skal stoppe dem for deg?" +StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Terminerer ${APPLICATION_EXECUTABLE}-prosesser." +StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Fant ikke prosess som skulle termineres!" +StrCpy $PageReinstall_NEW_Field_1 "En eldre versjon av ${APPLICATION_NAME} er installert p systemet ditt. Det anbefales at du avnistallerer den versjonen fr installering av ny versjon. Velg hva du vil gjre og klikk Neste for fortsette." +StrCpy $PageReinstall_NEW_Field_2 "Avinstaller fr installering" +StrCpy $PageReinstall_NEW_Field_3 "Ikke avinstaller" +StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Allerede installert" +StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Velg hvordan du vil installere ${APPLICATION_NAME}." +StrCpy $PageReinstall_OLD_Field_1 "En nyere versjon av ${APPLICATION_NAME} er allerede installert! Det anbefales ikke at du installerer en eldre versjon. Hvis du virkelig nsker installere denne eldre versjonen, er det bedre avinstallere gjeldende versjon frst. Velg hva du vil gjre og klikk Neste for fortsette." +StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} er allerede installert.\nVelg hva du vil gjre og klikk Neste for fortsette." +StrCpy $PageReinstall_SAME_Field_2 "Legg til/installer komponenter p nytt" +StrCpy $PageReinstall_SAME_Field_3 "Avinstaller ${APPLICATION_NAME}" +StrCpy $UNINSTALLER_APPDATA_TITLE "Avinstaller ${APPLICATION_NAME}" +StrCpy $PageReinstall_SAME_MUI_HEADER_TEXT_SUBTITLE "Velg hva slags vedlikehold som skal utfres." +StrCpy $SEC_APPLICATION_DETAILS "Installerer ${APPLICATION_NAME} grunnleggende." +StrCpy $OPTION_SECTION_SC_SHELL_EXT_SECTION "Integrering med Windows Utforsker" +StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "Installerer integrering med Windows Utforsker" +StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Snarvei i Start-menyen" +StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "Legger til snarvei for ${APPLICATION_NAME} i Start-menyen." +StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Snarvei p skrivebordet" +StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "Oppretter snarveier p skrivebordet" +StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Snarvei i Hurtigstart" +StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "Oppretter snarvei i Hurtigstart" +StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "${APPLICATION_NAME} grunnleggende." +StrCpy $OPTION_SECTION_SC_START_MENU_Desc "${APPLICATION_NAME}-snarvei." +StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Skrivebordssnarvei for ${APPLICATION_NAME}." +StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Hurtigstart-snarvei for ${APPLICATION_NAME}." +StrCpy $UNINSTALLER_APPDATA_SUBTITLE "Fjern ${APPLICATION_NAME} sin datamappe fra datamaskinen." +StrCpy $UNINSTALLER_APPDATA_LABEL_1 "nsker du slette ${APPLICATION_NAME} sin datamappe?" +StrCpy $UNINSTALLER_APPDATA_LABEL_2 "Ikke kryss av dersom du vil beholde datamappen for senere bruk. Kryss av for slette mappen." +StrCpy $UNINSTALLER_APPDATA_CHECKBOX "Ja, slett denne datamappen." +StrCpy $UNINSTALLER_FILE_Detail "Skriver Avinstallasjonsprogram." +StrCpy $UNINSTALLER_REGISTRY_Detail "Skriver registernkler for installasjonsprogrammet" +StrCpy $UNINSTALLER_FINISHED_Detail "Ferdig" +StrCpy $UNINSTALL_MESSAGEBOX "Det ser ikke ut som ${APPLICATION_NAME} er installert i mappe '$INSTDIR'.$\n$\nFortsett likevel (ikke anbefalt)?" +StrCpy $UNINSTALL_ABORT "Avinstallering avbrutt av bruker" +StrCpy $INIT_NO_QUICK_LAUNCH "Hurtigstart-snarvei (I/T)" +StrCpy $INIT_NO_DESKTOP "Snarvei p skrivebordet (skriver over eksisterende)" +StrCpy $UAC_ERROR_ELEVATE "Klarte ikke heve tilgangsniv. Feil: " +StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Dette installasjonsprogrammet krever administrasjonstilgang. Prv igjen" +StrCpy $INIT_INSTALLER_RUNNING "Installasjonsprogrammet kjrer allerede." +StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Avinstallasjonsprogrammet krever administrasjonstilgang. Prv igjen" +StrCpy $INIT_UNINSTALLER_RUNNING "Avinstallasjonsprogrammet kjrer allerede." +StrCpy $SectionGroup_Shortcuts "Snarveier" diff --git a/admin/win/nsi/l10n/bin/build_locale_nsi.py b/admin/win/nsi/l10n/bin/build_locale_nsi.py index d13c87a7d..cb52df433 100755 --- a/admin/win/nsi/l10n/bin/build_locale_nsi.py +++ b/admin/win/nsi/l10n/bin/build_locale_nsi.py @@ -67,7 +67,7 @@ localeToName = { "mg" : "Malagasy", "ms" : "Malay", "mn" : "Mongolian", - "nb" : "Norwegian", + "nb_NO" : "Norwegian", "nn" : "NorwegianNynorsk", "ps" : "Pashto", "pl" : "Polish", diff --git a/admin/win/nsi/l10n/bin/l10n.sh b/admin/win/nsi/l10n/bin/l10n.sh index 7dcd86a47..c4bf8736a 100755 --- a/admin/win/nsi/l10n/bin/l10n.sh +++ b/admin/win/nsi/l10n/bin/l10n.sh @@ -44,5 +44,6 @@ iconv -t CP1252 -o Finnish.nsh Finnish.nsh iconv -t CP932 -o Japanese.nsh Japanese.nsh iconv -t CP1250 -o Slovak.nsh Slovak.nsh iconv -t CP1254 -o Turkish.nsh Turkish.nsh +iconv -t CP1252 -o Norwegian.nsh Norwegian.nsh diff --git a/admin/win/nsi/l10n/languages.nsh b/admin/win/nsi/l10n/languages.nsh index 334209793..042b8f2a6 100644 --- a/admin/win/nsi/l10n/languages.nsh +++ b/admin/win/nsi/l10n/languages.nsh @@ -8,13 +8,14 @@ !insertmacro MUI_LANGUAGE "Hungarian" !insertmacro MUI_LANGUAGE "Ukrainian" !insertmacro MUI_LANGUAGE "French" -!insertmacro MUI_LANGUAGE "Catalan" +!insertmacro MUI_LANGUAGE "Norwegian" !insertmacro MUI_LANGUAGE "Russian" !insertmacro MUI_LANGUAGE "Finnish" !insertmacro MUI_LANGUAGE "Basque" !insertmacro MUI_LANGUAGE "Greek" !insertmacro MUI_LANGUAGE "SimpChinese" !insertmacro MUI_LANGUAGE "PortugueseBR" +!insertmacro MUI_LANGUAGE "Catalan" !insertmacro MUI_LANGUAGE "Italian" !insertmacro MUI_LANGUAGE "Portuguese" !insertmacro MUI_LANGUAGE "German" diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in index 8ec3cfb25..0f333869f 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -175,10 +175,11 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}" StrCmp $LANGUAGE ${LANG_ITALIAN} Italian 0 StrCmp $LANGUAGE ${LANG_ESTONIAN} Estonian 0 StrCmp $LANGUAGE ${LANG_GREEK} Greek 0 - StrCmp $LANGUAGE ${LANG_GREEK} Basque 0 - StrCmp $LANGUAGE ${LANG_GREEK} Galician 0 - StrCmp $LANGUAGE ${LANG_GREEK} Slovak 0 - StrCmp $LANGUAGE ${LANG_GREEK} Turkish 0 + StrCmp $LANGUAGE ${LANG_BASQUE} Basque 0 + StrCmp $LANGUAGE ${LANG_GALICIAN} Galician 0 + StrCmp $LANGUAGE ${LANG_SLOVAC} Slovak 0 + StrCmp $LANGUAGE ${LANG_TURKISH} Turkish 0 + StrCmp $LANGUAGE ${LANG_NORWEGIAN} Norwegian 0 StrCmp $LANGUAGE ${LANG_PORTUGUESEBR} Brazilian EndLanguageCmp German: !include "${source_path}/admin/win/nsi/l10n\German.nsh" @@ -221,6 +222,9 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}" Goto EndLanguageCmp Brazilian: !include "${source_path}/admin/win/nsi/l10n\PortugueseBR.nsh" + Goto EndLanguageCmp + Norwegian: + !include "${source_path}/admin/win/nsi/l10n\Norwegian.nsh" EndLanguageCmp: FunctionEnd @@ -777,7 +781,7 @@ Function .onInit goto UAC_Elevate ;Prevent multiple instances. - System::Call 'kernel32::CreateMutexA(i 0, i 0, t "owncloudInstaller") i .r1 ?e' + System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${APPLICATION_SHORTNAME}Installer") i .r1 ?e' Pop $R0 StrCmp $R0 0 +3 MessageBox MB_OK|MB_ICONEXCLAMATION $INIT_INSTALLER_RUNNING @@ -842,7 +846,7 @@ Function un.onInit goto UAC_Elevate ;Prevent multiple instances. - System::Call 'kernel32::CreateMutexA(i 0, i 0, t "owncloudUninstaller") i .r1 ?e' + System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${APPLICATION_SHORTNAME}Uninstaller") i .r1 ?e' Pop $R0 StrCmp $R0 0 +3 MessageBox MB_OK|MB_ICONEXCLAMATION $INIT_UNINSTALLER_RUNNING diff --git a/cmake/modules/QtVersionAbstraction.cmake b/cmake/modules/QtVersionAbstraction.cmake index 020aab4ea..760e9ed3a 100644 --- a/cmake/modules/QtVersionAbstraction.cmake +++ b/cmake/modules/QtVersionAbstraction.cmake @@ -17,6 +17,7 @@ if( Qt5Core_FOUND ) message(STATUS "Found Qt5 core, checking for further dependencies...") find_package(Qt5Network REQUIRED) find_package(Qt5Xml REQUIRED) + find_package(Qt5Concurrent REQUIRED) if(NOT TOKEN_AUTH_ONLY) find_package(Qt5WebKitWidgets REQUIRED) find_package(Qt5WebKit REQUIRED) diff --git a/config.h.in b/config.h.in index 48e9d8852..601dc6be3 100644 --- a/config.h.in +++ b/config.h.in @@ -19,6 +19,8 @@ #cmakedefine APPLICATION_EXECUTABLE "@APPLICATION_EXECUTABLE@" #cmakedefine APPLICATION_UPDATE_URL "@APPLICATION_UPDATE_URL@" +#cmakedefine ZLIB_FOUND @ZLIB_FOUND@ + #cmakedefine SYSCONFDIR "@SYSCONFDIR@" #cmakedefine DATADIR "@DATADIR@" diff --git a/csync/tests/ownCloud/ownCloud/Test.pm b/csync/tests/ownCloud/ownCloud/Test.pm index 6e755b054..821ffbdf0 100644 --- a/csync/tests/ownCloud/ownCloud/Test.pm +++ b/csync/tests/ownCloud/ownCloud/Test.pm @@ -192,7 +192,6 @@ sub removeRemoteDir($;$) my ($dir, $optionsRef) = @_; my $url = testDirUrl() . $dir; - if( $optionsRef && $optionsRef->{user} && $optionsRef->{passwd} ) { $d->credentials( -url=> $owncloud, -realm=>"ownCloud", -user=> $optionsRef->{user}, @@ -327,11 +326,11 @@ sub assertLocalDirs( $$ ) opendir(my $dh, $dir1 ) || die; while(readdir $dh) { - assert( -e "$dir2/$_" ); + assert( -e "$dir2/$_", " $dir2/$_ do not exist" ); next if( -d "$dir1/$_"); # don't compare directory sizes. my $s1 = -s "$dir1/$_"; my $s2 = -s "$dir2/$_"; - assert( $s1 == $s2, "$dir1/$_ <-> $dir2/$_" ); + assert( $s1 == $s2, "$dir1/$_ <-> $dir2/$_ size not equal ($s1 != $s2)" ); } closedir $dh; } @@ -525,7 +524,9 @@ sub put_to_dir( $$;$ ) my $filename = $file; $filename =~ s/^.*\///; + $filename =~ s/#/%23/g; # poor man's URI encoder my $puturl = $targetUrl . $dir. $filename; + print "put_to_dir puts to $puturl\n"; unless ($d->put( -local => $file, -url => $puturl )) { print " ### FAILED to put a single file!\n"; diff --git a/csync/tests/ownCloud/t_recall.pl b/csync/tests/ownCloud/t_recall.pl new file mode 100755 index 000000000..008cad8fd --- /dev/null +++ b/csync/tests/ownCloud/t_recall.pl @@ -0,0 +1,85 @@ +#!/usr/bin/perl +# +# Test script for the ownCloud module of csync. +# This script requires a running ownCloud instance accessible via HTTP. +# It does quite some fancy tests and asserts the results. +# +# Copyright (C) by Olivier Goffart +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# + +use lib "."; + + +use File::Copy; +use ownCloud::Test; + +use strict; + +print "Hello, this is t_recall, a tester for the recall feature\n"; + +initTesting(); + +printInfo( "Syncing two files with the same name that differ with case" ); + +#create some files +my $tmpdir = "/tmp/t_recall/"; +mkdir($tmpdir); +createLocalFile( $tmpdir . "file1.dat", 100 ); +createLocalFile( $tmpdir . "file2.dat", 150 ); +createLocalFile( $tmpdir . "file3.dat", 110 ); +createLocalFile( $tmpdir . "file4.dat", 170 ); + +#put them in some directories +createRemoteDir( "dir" ); +glob_put( "$tmpdir/*", "dir" ); + +csync(); + +assertLocalAndRemoteDir( '', 0); + + + +printInfo( "Testing with a .sys.admin#recall#" ); +system("echo 'dir/file2.dat' > ". $tmpdir . ".sys.admin\#recall\#"); +system("echo 'dir/file3.dat' >> ". $tmpdir . ".sys.admin\#recall\#"); +glob_put( "$tmpdir/.sys.admin\#recall\#", "" ); + +csync(); + +#test that the recall files have been created +assert( -e glob(localDir().'dir/file2_.sys.admin#recall#-*.dat' ) ); +assert( -e glob(localDir().'dir/file3_.sys.admin#recall#-*.dat' ) ); + +#Remove the recall file +unlink(localDir() . ".sys.admin#recall#"); + +# 2 sync necessary for the recall to be uploaded +csync(); + +assertLocalAndRemoteDir( '', 0); + +printInfo( "Testing with a dir/.sys.admin#recall#" ); +system("echo 'file4.dat' > ". $tmpdir . ".sys.admin\#recall\#"); +glob_put( "$tmpdir/.sys.admin\#recall\#", "dir" ); + +csync(); +assert( -e glob(localDir().'dir/file4_.sys.admin#recall#-*.dat' ) ); + + +cleanup(); +system("rm -r " . $tmpdir); + diff --git a/src/gui/accountsettings.ui b/src/gui/accountsettings.ui index 82ea9e235..a19dcbeef 100644 --- a/src/gui/accountsettings.ui +++ b/src/gui/accountsettings.ui @@ -40,6 +40,9 @@ Connected with <server> as <user> + + true + diff --git a/src/gui/accountstate.cpp b/src/gui/accountstate.cpp index a2c9cf63e..9588cd096 100644 --- a/src/gui/accountstate.cpp +++ b/src/gui/accountstate.cpp @@ -114,9 +114,10 @@ void AccountState::setState(State state) } else if (oldState == SignedOut && _state == Disconnected) { checkConnectivity(); } - - emit stateChanged(_state); } + + // might not have changed but the underlying _connectionErrors might have + emit stateChanged(_state); } QString AccountState::stateString(State state) @@ -174,7 +175,12 @@ void AccountState::checkConnectivity() return; } + if (_connectionValidator) { + qDebug() << "ConnectionValidator already running, ignoring"; + return; + } ConnectionValidator * conValidator = new ConnectionValidator(account()); + _connectionValidator = conValidator; connect(conValidator, SIGNAL(connectionResult(ConnectionValidator::Status,QStringList)), SLOT(slotConnectionValidatorResult(ConnectionValidator::Status,QStringList))); if (isConnected()) { @@ -263,6 +269,12 @@ void AccountState::slotCredentialsFetched(AbstractCredentials* credentials) return; } + // When new credentials become available we always want to restart the + // connection validation, even if it's currently running. + if (_connectionValidator) { + delete _connectionValidator; + } + checkConnectivity(); } diff --git a/src/gui/accountstate.h b/src/gui/accountstate.h index c21b25ead..97bca8fe3 100644 --- a/src/gui/accountstate.h +++ b/src/gui/accountstate.h @@ -16,6 +16,7 @@ #define ACCOUNTINFO_H #include +#include #include "utility.h" #include "connectionvalidator.h" @@ -128,6 +129,7 @@ private: ConnectionStatus _connectionStatus; QStringList _connectionErrors; bool _waitingForNewCredentials; + QPointer _connectionValidator; }; } diff --git a/src/gui/folderwizard.h b/src/gui/folderwizard.h index 06a3476ba..1431104c5 100644 --- a/src/gui/folderwizard.h +++ b/src/gui/folderwizard.h @@ -32,6 +32,7 @@ class SelectiveSyncTreeView; class ownCloudInfo; class FormatWarningsWizardPage : public QWizardPage { + Q_OBJECT protected: QString formatWarnings(const QStringList &warnings) const; }; diff --git a/src/gui/wizard/owncloudhttpcredspage.ui b/src/gui/wizard/owncloudhttpcredspage.ui index 466848160..58bddddae 100644 --- a/src/gui/wizard/owncloudhttpcredspage.ui +++ b/src/gui/wizard/owncloudhttpcredspage.ui @@ -57,6 +57,9 @@ Error Label + + true + diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt index e926f1b78..7247d16a6 100644 --- a/src/libsync/CMakeLists.txt +++ b/src/libsync/CMakeLists.txt @@ -61,6 +61,7 @@ set(libsync_SRCS theme.cpp utility.cpp ownsql.cpp + transmissionchecksumvalidator.cpp creds/dummycredentials.cpp creds/abstractcredentials.cpp creds/credentialsfactory.cpp @@ -141,6 +142,11 @@ if(NEON_FOUND) endif() endif() +if(ZLIB_FOUND) + list(APPEND libsync_LINK_TARGETS ${ZLIB_LIBRARIES}) + include_directories(${ZLIB_INCLUDE_DIRS}) +endif(ZLIB_FOUND) + add_library(${synclib_NAME} SHARED ${libsync_SRCS} ${syncMoc}) GENERATE_EXPORT_HEADER( ${synclib_NAME} BASE_NAME ${synclib_NAME} @@ -151,9 +157,9 @@ GENERATE_EXPORT_HEADER( ${synclib_NAME} if(TOKEN_AUTH_ONLY) - qt5_use_modules(${synclib_NAME} Network) + qt5_use_modules(${synclib_NAME} Network Concurrent) else() - qt5_use_modules(${synclib_NAME} Widgets Network WebKitWidgets) + qt5_use_modules(${synclib_NAME} Widgets Network WebKitWidgets Concurrent) endif() set_target_properties( ${synclib_NAME} PROPERTIES diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp index d8a3bf3f6..2b04b1131 100644 --- a/src/libsync/configfile.cpp +++ b/src/libsync/configfile.cpp @@ -49,6 +49,7 @@ static const char optionalDesktopNoficationsC[] = "optionalDesktopNotifications" static const char skipUpdateCheckC[] = "skipUpdateCheck"; static const char geometryC[] = "geometry"; static const char timeoutC[] = "timeout"; +static const char transmissionChecksumC[] = "transmissionChecksum"; static const char proxyHostC[] = "Proxy/host"; static const char proxyTypeC[] = "Proxy/type"; @@ -118,6 +119,20 @@ int ConfigFile::timeout() const return settings.value(QLatin1String(timeoutC), 300).toInt(); // default to 5 min } +QString ConfigFile::transmissionChecksum() const +{ + QSettings settings(configFile(), QSettings::IniFormat); + + QString checksum = settings.value(QLatin1String(transmissionChecksumC), QString()).toString(); + + if( checksum.isEmpty() ) { + // if the config file setting is empty, maybe the Branding requires it. + checksum = Theme::instance()->transmissionChecksum(); + } + + return checksum; +} + void ConfigFile::setOptionalDesktopNotifications(bool show) { QSettings settings(configFile(), QSettings::IniFormat); diff --git a/src/libsync/configfile.h b/src/libsync/configfile.h index 54652b6c9..d1af84c55 100644 --- a/src/libsync/configfile.h +++ b/src/libsync/configfile.h @@ -103,6 +103,12 @@ public: int timeout() const; + // send a checksum as a header along with the transmission or not. + // possible values: + // empty: no checksum calculated or expected. + // or "Adler32", "MD5", "SHA1" + QString transmissionChecksum() const; + void saveGeometry(QWidget *w); void restoreGeometry(QWidget *w); diff --git a/src/libsync/filesystem.cpp b/src/libsync/filesystem.cpp index 4191686d0..b3fb52657 100644 --- a/src/libsync/filesystem.cpp +++ b/src/libsync/filesystem.cpp @@ -18,6 +18,11 @@ #include #include #include +#include + +#ifdef ZLIB_FOUND +#include +#endif #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) #include @@ -394,4 +399,58 @@ QString FileSystem::fileSystemForPath(const QString & path) } #endif +#define BUFSIZE 1024*1024*10 + +static QByteArray readToCrypto( const QString& filename, QCryptographicHash::Algorithm algo ) +{ + const qint64 bufSize = BUFSIZE; + QByteArray buf(bufSize,0); + QByteArray arr; + QCryptographicHash crypto( algo ); + + QFile file(filename); + if (file.open(QIODevice::ReadOnly)) { + qint64 size; + while (!file.atEnd()) { + size = file.read( buf.data(), bufSize ); + if( size > 0 ) { + crypto.addData(buf.data(), size); + } + } + arr = crypto.result().toHex(); + } + return arr; +} + +QByteArray FileSystem::calcMd5( const QString& filename ) +{ + return readToCrypto( filename, QCryptographicHash::Md5 ); +} + +QByteArray FileSystem::calcSha1( const QString& filename ) +{ + return readToCrypto( filename, QCryptographicHash::Sha1 ); +} + +#ifdef ZLIB_FOUND +QByteArray FileSystem::calcAdler32( const QString& filename ) +{ + unsigned int adler = adler32(0L, Z_NULL, 0); + const qint64 bufSize = BUFSIZE; + QByteArray buf(bufSize, 0); + + QFile file(filename); + if (file.open(QIODevice::ReadOnly)) { + qint64 size; + while (!file.atEnd()) { + size = file.read(buf.data(), bufSize); + if( size > 0 ) + adler = adler32(adler, (const Bytef*) buf.data(), size); + } + } + + return QByteArray::number( adler, 16 ); +} +#endif + } // namespace OCC diff --git a/src/libsync/filesystem.h b/src/libsync/filesystem.h index ac51e6395..9e314a191 100644 --- a/src/libsync/filesystem.h +++ b/src/libsync/filesystem.h @@ -13,8 +13,11 @@ #pragma once +#include "config.h" + #include #include +#include #include @@ -121,4 +124,10 @@ bool openAndSeekFileSharedRead(QFile* file, QString* error, qint64 seek); QString fileSystemForPath(const QString & path); #endif +QByteArray calcMd5( const QString& fileName ); +QByteArray calcSha1( const QString& fileName ); +#ifdef ZLIB_FOUND +QByteArray calcAdler32( const QString& fileName ); +#endif + }} diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp index 8cba118ed..27d24b120 100644 --- a/src/libsync/networkjobs.cpp +++ b/src/libsync/networkjobs.cpp @@ -43,7 +43,6 @@ namespace OCC { AbstractNetworkJob::AbstractNetworkJob(AccountPtr account, const QString &path, QObject *parent) : QObject(parent) - , _duration(0) , _timedout(false) , _followRedirects(false) , _ignoreCredentialFailure(false) @@ -307,8 +306,12 @@ MkColJob::MkColJob(AccountPtr account, const QString &path, QObject *parent) void MkColJob::start() { - // assumes ownership - QNetworkReply *reply = davRequest("MKCOL", path()); + // add 'Content-Length: 0' header (see https://github.com/owncloud/client/issues/3256) + QNetworkRequest req; + req.setRawHeader("Content-Length", "0"); + + // assumes ownership + QNetworkReply *reply = davRequest("MKCOL", path(), req); setReply(reply); setupConnections(reply); AbstractNetworkJob::start(); diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp index 49b3d0be7..1d8d121cf 100644 --- a/src/libsync/owncloudpropagator.cpp +++ b/src/libsync/owncloudpropagator.cpp @@ -259,6 +259,21 @@ void OwncloudPropagator::start(const SyncFileItemVector& items) { Q_ASSERT(std::is_sorted(items.begin(), items.end())); + /* Check and log the transmission checksum type */ + ConfigFile cfg; + const QString checksumType = cfg.transmissionChecksum().toUpper(); + + /* if the checksum type is empty, it is not send. No error */ + if( !checksumType.isEmpty() ) { + if( checksumType == checkSumAdlerUpperC || + checksumType == checkSumMD5C || + checksumType == checkSumSHA1C ) { + qDebug() << "Client sends and expects transmission checksum type" << checksumType; + } else { + qWarning() << "Unknown transmission checksum type from config" << checksumType; + } + } + /* This builds all the job needed for the propagation. * Each directories is a PropagateDirectory job, which contains the files in it. * In order to do that we loop over the items. (which are sorted by destination) diff --git a/src/libsync/ownsql.cpp b/src/libsync/ownsql.cpp index ab8787601..0aba75618 100644 --- a/src/libsync/ownsql.cpp +++ b/src/libsync/ownsql.cpp @@ -345,7 +345,7 @@ QString SqlQuery::lastQuery() const int SqlQuery::numRowsAffected() { - return 1; + return sqlite3_changes(_db); } void SqlQuery::finish() diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp index d0286243a..f7af0b84f 100644 --- a/src/libsync/propagatedownload.cpp +++ b/src/libsync/propagatedownload.cpp @@ -12,6 +12,7 @@ * for more details. */ +#include "config.h" #include "owncloudpropagator_p.h" #include "propagatedownload.h" #include "networkjobs.h" @@ -21,6 +22,8 @@ #include "utility.h" #include "filesystem.h" #include "propagatorjobs.h" +#include "transmissionchecksumvalidator.h" + #include #include #include @@ -30,11 +33,10 @@ namespace OCC { - // Always coming in with forward slashes. // In csync_excluded_no_ctx we ignore all files with longer than 254 chars // This function also adds a dot at the begining of the filename to hide the file on OS X and Linux -QString createDownloadTmpFileName(const QString &previous) { +QString OWNCLOUDSYNC_EXPORT createDownloadTmpFileName(const QString &previous) { QString tmpFileName; QString tmpPath; int slashPos = previous.lastIndexOf('/'); @@ -484,7 +486,21 @@ void PropagateDownloadFileQNAM::slotGetFinished() return; } - downloadFinished(); + // Do checksum validation for the download. If there is no checksum header, the validator + // will also emit the validated() signal to continue the flow in slot downloadFinished() + // as this is (still) also correct. + TransmissionChecksumValidator *validator = new TransmissionChecksumValidator(_tmpFile.fileName(), this); + connect(validator, SIGNAL(validated(QByteArray)), this, SLOT(downloadFinished())); + connect(validator, SIGNAL(validationFailed(QString)), this, SLOT(slotChecksumFail(QString))); + validator->downloadValidation(job->reply()->rawHeader(checkSumHeaderC)); + +} + +void PropagateDownloadFileQNAM::slotChecksumFail( const QString& errMsg ) +{ + _tmpFile.remove(); + _propagator->_anotherSyncNeeded = true; + done(SyncFileItem::SoftError, errMsg ); // tr("The file downloaded with a broken checksum, will be redownloaded.")); } QString makeConflictFileName(const QString &fn, const QDateTime &dt) @@ -508,6 +524,52 @@ QString makeConflictFileName(const QString &fn, const QDateTime &dt) return conflictFileName; } + +namespace { // Anonymous namespace for the recall feature +static QString makeRecallFileName(const QString &fn) +{ + QString recallFileName(fn); + // Add _recall-XXXX before the extention. + int dotLocation = recallFileName.lastIndexOf('.'); + // If no extention, add it at the end (take care of cases like foo/.hidden or foo.bar/file) + if (dotLocation <= recallFileName.lastIndexOf('/') + 1) { + dotLocation = recallFileName.size(); + } + + QString timeString = QDateTime::currentDateTime().toString("yyyyMMdd-hhmmss"); + recallFileName.insert(dotLocation, "_.sys.admin#recall#-" + timeString); + + return recallFileName; +} + +static void handleRecallFile(const QString &fn) +{ + qDebug() << "handleRecallFile: " << fn; + + FileSystem::setFileHidden(fn, true); + + QFile file(fn); + if (!file.open(QIODevice::ReadOnly)) { + qWarning() << "Could not open recall file" << file.errorString(); + return; + } + QFileInfo existingFile(fn); + QDir thisDir = existingFile.dir(); + + while (!file.atEnd()) { + QByteArray line = file.readLine(); + line.chop(1); // remove trailing \n + QString fpath = thisDir.filePath(line); + QString rpath = makeRecallFileName(fpath); + + // if previously recalled file exists then remove it (copy will not overwrite it) + QFile(rpath).remove(); + qDebug() << "Copy recall file: " << fpath << " -> " << rpath; + QFile::copy(fpath,rpath); + } +} +} // end namespace + void PropagateDownloadFileQNAM::downloadFinished() { QString fn = _propagator->getFilePath(_item->_file); @@ -592,6 +654,11 @@ void PropagateDownloadFileQNAM::downloadFinished() _propagator->_journal->setDownloadInfo(_item->_file, SyncJournalDb::DownloadInfo()); _propagator->_journal->commit("download file start2"); done(isConflict ? SyncFileItem::Conflict : SyncFileItem::Success); + + // handle the special recall file + if(_item._file == QLatin1String(".sys.admin#recall#") || _item._file.endsWith("/.sys.admin#recall#")) { + handleRecallFile(fn); + } } void PropagateDownloadFileQNAM::slotDownloadProgress(qint64 received, qint64) diff --git a/src/libsync/propagatedownload.h b/src/libsync/propagatedownload.h index c63aa2ae8..ea14c0612 100644 --- a/src/libsync/propagatedownload.h +++ b/src/libsync/propagatedownload.h @@ -101,19 +101,21 @@ private slots: class PropagateDownloadFileQNAM : public PropagateItemJob { Q_OBJECT - QPointer _job; - -// QFile *_file; - QFile _tmpFile; public: PropagateDownloadFileQNAM(OwncloudPropagator* propagator,const SyncFileItemPtr& item) : PropagateItemJob(propagator, item) {} void start() Q_DECL_OVERRIDE; + private slots: void slotGetFinished(); void abort() Q_DECL_OVERRIDE; void downloadFinished(); void slotDownloadProgress(qint64,qint64); + void slotChecksumFail( const QString& errMsg ); + +private: + QPointer _job; + QFile _tmpFile; }; } diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp index 8af40cb0d..2cf42c426 100644 --- a/src/libsync/propagateupload.cpp +++ b/src/libsync/propagateupload.cpp @@ -12,6 +12,7 @@ * for more details. */ +#include "config.h" #include "propagateupload.h" #include "owncloudpropagator_p.h" #include "networkjobs.h" @@ -21,6 +22,8 @@ #include "utility.h" #include "filesystem.h" #include "propagatorjobs.h" +#include "transmissionchecksumvalidator.h" + #include #include #include @@ -94,10 +97,11 @@ void PUTFileJob::start() { // For Qt versions not including https://codereview.qt-project.org/110150 // Also do the runtime check if compiled with an old Qt but running with fixed one. + // (workaround disabled on windows and mac because the binaries we ship have patched qt) #if QT_VERSION < QT_VERSION_CHECK(4, 8, 7) if (QLatin1String(qVersion()) < QLatin1String("4.8.7")) connect(_device.data(), SIGNAL(wasReset()), this, SLOT(slotSoftAbort())); -#elif QT_VERSION > QT_VERSION_CHECK(5, 0, 0) && QT_VERSION < QT_VERSION_CHECK(5, 4, 2) +#elif QT_VERSION > QT_VERSION_CHECK(5, 0, 0) && QT_VERSION < QT_VERSION_CHECK(5, 4, 2) && !defined Q_OS_WIN && !defined Q_OS_MAC if (QLatin1String(qVersion()) < QLatin1String("5.4.2")) connect(_device.data(), SIGNAL(wasReset()), this, SLOT(slotSoftAbort())); #endif @@ -190,22 +194,50 @@ bool PollJob::finished() return true; } - void PropagateUploadFileQNAM::start() { if (_propagator->_abortRequested.fetchAndAddRelaxed(0)) { return; } - const QString fullFilePath(_propagator->getFilePath(_item->_file)); + const QString filePath = _propagator->getFilePath(_item->_file); + + // remember the modtime before checksumming to be able to detect a file + // change during the checksum calculation + _item._modtime = FileSystem::getModTime(filePath); + + _stopWatch.start(); + + // do whatever is needed to add a checksum to the http upload request. + // in any case, the validator will emit signal startUpload to let the flow + // continue in slotStartUpload here. + TransmissionChecksumValidator *validator = new TransmissionChecksumValidator(filePath, this); + connect(validator, SIGNAL(validated(QByteArray)), this, SLOT(slotStartUpload(QByteArray))); + validator->uploadValidation(); +} + +void PropagateUploadFileQNAM::slotStartUpload(const QByteArray& checksum) +{ + + _item._checksum = checksum; if (!FileSystem::fileExists(fullFilePath)) { done(SyncFileItem::SoftError, tr("File Removed")); return; } + _stopWatch.addLapTime(QLatin1String("Checksum")); + + time_t prevModtime = _item._modtime; // the _item value was set in PropagateUploadFileQNAM::start() + // but a potential checksum calculation could have taken some time during which the file could + // have been changed again, so better check again here. - // Update the mtime and size, it might have changed since discovery. _item->_modtime = FileSystem::getModTime(fullFilePath); + if( prevModtime != _item._modtime ) { + _propagator->_anotherSyncNeeded = true; + done(SyncFileItem::SoftError, tr("Local file changed during syncing. It will be resumed.")); + return; + } + quint64 fileSize = FileSystem::getSize(fullFilePath); _item->_size = fileSize; @@ -392,6 +424,18 @@ void PropagateUploadFileQNAM::startNextChunk() headers["OC-Chunk-Size"]= QByteArray::number(quint64(chunkSize())); headers["Content-Type"] = "application/octet-stream"; headers["X-OC-Mtime"] = QByteArray::number(qint64(_item->_modtime)); + + if(_item->_file.contains(".sys.admin#recall#")) { + // This is a file recall triggered by the admin. Note: the + // recall list file created by the admin and downloaded by the + // client (.sys.admin#recall#) also falls into this category + // (albeit users are not supposed to mess up with it) + + // We use a special tag header so that the server may decide to store this file away in some admin stage area + // And not directly in the user's area (what would trigger redownloads etc). + headers["OC-Tag"] = ".sys.admin#recall#"; + } + if (!_item->_etag.isEmpty() && _item->_etag != "empty_etag" && _item->_instruction != CSYNC_INSTRUCTION_NEW // On new files never send a If-Match ) { @@ -420,6 +464,14 @@ void PropagateUploadFileQNAM::startNextChunk() if( currentChunkSize == 0 ) { // if the last chunk pretents to be 0, its actually the full chunk size. currentChunkSize = chunkSize(); } + if( !_item._checksum.isEmpty() ) { + headers[checkSumHeaderC] = _item._checksum; + } + } + } else { + // checksum if its only one chunk + if( !_item._checksum.isEmpty() ) { + headers[checkSumHeaderC] = _item._checksum; } } @@ -640,6 +692,11 @@ void PropagateUploadFileQNAM::slotPutFinished() // Well, the mtime was not set #endif } + + // performance logging + _item._requestDuration = _stopWatch.stop(); + qDebug() << "*==* duration UPLOAD" << _item._size << _stopWatch.durationOfLap(QLatin1String("Checksum")) << _item._requestDuration; + finalize(*_item); } diff --git a/src/libsync/propagateupload.h b/src/libsync/propagateupload.h index 2840857f0..946a9fd71 100644 --- a/src/libsync/propagateupload.h +++ b/src/libsync/propagateupload.h @@ -20,6 +20,7 @@ #include #include + namespace OCC { class BandwidthManager; @@ -75,6 +76,8 @@ protected slots: class PUTFileJob : public AbstractNetworkJob { Q_OBJECT + +private: QScopedPointer _device; QMap _headers; QString _errorString; @@ -146,6 +149,7 @@ signals: class PropagateUploadFileQNAM : public PropagateItemJob { Q_OBJECT +private: /** * That's the start chunk that was stored in the database for resuming. * In the non-resuming case it is 0. @@ -163,6 +167,10 @@ class PropagateUploadFileQNAM : public PropagateItemJob { QElapsedTimer _duration; QVector _jobs; /// network jobs that are currently in transit bool _finished; // Tells that all the jobs have been finished + + // measure the performance of checksum calc and upload + Utility::StopWatch _stopWatch; + public: PropagateUploadFileQNAM(OwncloudPropagator* propagator,const SyncFileItemPtr& item) : PropagateItemJob(propagator, item), _startChunk(0), _currentChunk(0), _chunkCount(0), _transferId(0), _finished(false) {} @@ -175,6 +183,8 @@ private slots: void startNextChunk(); void finalize(const SyncFileItem&); void slotJobDestroyed(QObject *job); + void slotStartUpload(const QByteArray &checksum); + private: void startPollJob(const QString& path); void abortWithError(SyncFileItem::Status status, const QString &error); diff --git a/src/libsync/propagatorjobs.h b/src/libsync/propagatorjobs.h index 06b3c23be..cdf7074f1 100644 --- a/src/libsync/propagatorjobs.h +++ b/src/libsync/propagatorjobs.h @@ -21,6 +21,22 @@ namespace OCC { +/** + * Tags for checksum headers. + * They are here for being shared between Upload- and Download Job + */ + +// the header itself +static const char checkSumHeaderC[] = "OC-Checksum"; +// ...and it's values +static const char checkSumMD5C[] = "MD5"; +static const char checkSumSHA1C[] = "SHA1"; +static const char checkSumAdlerC[] = "Adler32"; +static const char checkSumAdlerUpperC[] = "ADLER32"; + +/** + * Declaration of the other propagation jobs + */ class PropagateLocalRemove : public PropagateItemJob { Q_OBJECT public: diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp index a9f34c835..208c38198 100644 --- a/src/libsync/syncengine.cpp +++ b/src/libsync/syncengine.cpp @@ -591,7 +591,6 @@ void SyncEngine::startSync() #endif fileRecordCount = _journal->getFileRecordCount(); // this creates the DB if it does not exist yet - bool isUpdateFrom_1_5 = _journal->isUpdateFrom_1_5(); if( fileRecordCount == -1 ) { qDebug() << "No way to create a sync journal!"; @@ -601,21 +600,7 @@ void SyncEngine::startSync() // database creation error! } - bool isUpdateFrom_1_8 = _journal->isUpdateFrom_1_8_0(); - - /* - * If we are upgrading from a client version older than 1.5 is found, - * we cannot read from the database because we need to fetch the files id and etags. - * - * If 1.8.0 caused missing data in the local tree, so we also don't read from DB - * to get back the files that were gone. - */ - if (fileRecordCount >= 1 && (isUpdateFrom_1_5 || isUpdateFrom_1_8)) { - qDebug() << "detected update from 1.5 or 1.8" << fileRecordCount << isUpdateFrom_1_5; - _csync_ctx->read_remote_from_db = false; - } else { - _csync_ctx->read_remote_from_db = true; - } + _csync_ctx->read_remote_from_db = true; // This tells csync to never read from the DB if it is empty // thereby speeding up the initial discovery significantly. diff --git a/src/libsync/syncfileitem.h b/src/libsync/syncfileitem.h index 3a9ee81ed..17cadfeb7 100644 --- a/src/libsync/syncfileitem.h +++ b/src/libsync/syncfileitem.h @@ -151,6 +151,7 @@ public: quint64 _inode; QByteArray _fileId; QByteArray _remotePerm; + QByteArray _checksum; QString _directDownloadUrl; QString _directDownloadCookies; diff --git a/src/libsync/syncjournaldb.cpp b/src/libsync/syncjournaldb.cpp index 599c67610..9298a120f 100644 --- a/src/libsync/syncjournaldb.cpp +++ b/src/libsync/syncjournaldb.cpp @@ -30,7 +30,7 @@ namespace OCC { SyncJournalDb::SyncJournalDb(const QString& path, QObject *parent) : - QObject(parent), _transaction(0), _possibleUpgradeFromMirall_1_5(false), _possibleUpgradeFromMirall_1_8_0(false) + QObject(parent), _transaction(0) { _dbFile = path; @@ -272,15 +272,14 @@ bool SyncJournalDb::checkConnect() return sqlFail("Create table version", createQuery); } - _possibleUpgradeFromMirall_1_5 = false; - _possibleUpgradeFromMirall_1_8_0 = false; + bool forceRemoteDiscovery = false; SqlQuery versionQuery("SELECT major, minor, patch FROM version;", _db); if (!versionQuery.next()) { // If there was no entry in the table, it means we are likely upgrading from 1.5 if (!isNewDb) { - qDebug() << Q_FUNC_INFO << "_possibleUpgradeFromMirall_1_5 detected!"; - _possibleUpgradeFromMirall_1_5 = true; + qDebug() << Q_FUNC_INFO << "possibleUpgradeFromMirall_1_5 detected!"; + forceRemoteDiscovery = true; } createQuery.prepare("INSERT INTO version VALUES (?1, ?2, ?3, ?4);"); createQuery.bindValue(1, MIRALL_VERSION_MAJOR); @@ -294,9 +293,9 @@ bool SyncJournalDb::checkConnect() int minor = versionQuery.intValue(1); int patch = versionQuery.intValue(2); - if( major == 1 && minor == 8 && patch == 0 ) { - qDebug() << Q_FUNC_INFO << "_possibleUpgradeFromMirall_1_8_0 detected!"; - _possibleUpgradeFromMirall_1_8_0 = true; + if( major == 1 && minor == 8 && (patch == 0 || patch == 1) ) { + qDebug() << Q_FUNC_INFO << "possibleUpgradeFromMirall_1_8_0_or_1 detected!"; + forceRemoteDiscovery = true; } // Not comparing the BUILD id here, correct? if( !(major == MIRALL_VERSION_MAJOR && minor == MIRALL_VERSION_MINOR && patch == MIRALL_VERSION_PATCH) ) { @@ -323,6 +322,25 @@ bool SyncJournalDb::checkConnect() qDebug() << "WARN: Failed to update the database structure!"; } + /* + * If we are upgrading from a client version older than 1.5 is found, + * we cannot read from the database because we need to fetch the files id and etags. + * + * If 1.8.0 caused missing data in the local tree, so we also don't read from DB + * to get back the files that were gone. + * In 1.8.1 we had a fix to re-get the data, but this one here is better + */ + if (forceRemoteDiscovery) { + qDebug() << "Forcing remote re-discovery by deleting folder Etags"; + SqlQuery deleteRemoteFolderEtagsQuery(_db); + deleteRemoteFolderEtagsQuery.prepare("UPDATE metadata SET md5='_invalid_' WHERE type=2;"); + if( !deleteRemoteFolderEtagsQuery.exec() ) { + qDebug() << "ERROR: Query failed" << deleteRemoteFolderEtagsQuery.error(); + } else { + qDebug() << "Cleared" << deleteRemoteFolderEtagsQuery.numRowsAffected() << "folder ETags"; + } + } + _getFileRecordQuery.reset(new SqlQuery(_db)); _getFileRecordQuery->prepare("SELECT path, inode, uid, gid, mode, modtime, type, md5, fileid, remotePerm, filesize FROM " "metadata WHERE phash=?1" ); @@ -409,7 +427,6 @@ void SyncJournalDb::close() _deleteFileRecordRecursively.reset(0); _getErrorBlacklistQuery.reset(0); _setErrorBlacklistQuery.reset(0); - _possibleUpgradeFromMirall_1_5 = false; _db.close(); _avoidReadFromDbOnNextSyncFilter.clear(); @@ -755,14 +772,6 @@ bool SyncJournalDb::postSyncCleanup(const QSet& filepathsToKeep, // Incoroporate results back into main DB walCheckpoint(); - if (_possibleUpgradeFromMirall_1_5) { - _possibleUpgradeFromMirall_1_5 = false; // should be handled now - } - - if (_possibleUpgradeFromMirall_1_8_0) { - _possibleUpgradeFromMirall_1_8_0 = false; // should be handled now - } - return true; } @@ -1155,12 +1164,11 @@ void SyncJournalDb::wipeErrorBlacklistEntry( const QString& file ) void SyncJournalDb::updateErrorBlacklistEntry( const SyncJournalErrorBlacklistRecord& item ) { + QMutexLocker locker(&_mutex); if( !checkConnect() ) { return; } - QMutexLocker locker(&_mutex); - _setErrorBlacklistQuery->bindValue(1, item._file); _setErrorBlacklistQuery->bindValue(2, item._lastTryEtag); _setErrorBlacklistQuery->bindValue(3, QString::number(item._lastTryModtime)); @@ -1325,20 +1333,6 @@ bool SyncJournalDb::isConnected() return checkConnect(); } -bool SyncJournalDb::isUpdateFrom_1_5() -{ - QMutexLocker lock(&_mutex); - checkConnect(); - return _possibleUpgradeFromMirall_1_5; -} - -bool SyncJournalDb::isUpdateFrom_1_8_0() -{ - QMutexLocker lock(&_mutex); - checkConnect(); - return _possibleUpgradeFromMirall_1_8_0; -} - bool operator==(const SyncJournalDb::DownloadInfo & lhs, const SyncJournalDb::DownloadInfo & rhs) { diff --git a/src/libsync/syncjournaldb.h b/src/libsync/syncjournaldb.h index 5fea8c1cd..6074631f1 100644 --- a/src/libsync/syncjournaldb.h +++ b/src/libsync/syncjournaldb.h @@ -113,13 +113,6 @@ public: */ bool isConnected(); - /** - * Tell the sync engine if we need to disable the fetch from db to be sure that the fileid - * are updated. - */ - bool isUpdateFrom_1_5(); - bool isUpdateFrom_1_8_0(); - private: bool updateDatabaseStructure(); bool updateMetadataTableStructure(); @@ -135,8 +128,6 @@ private: QString _dbFile; QMutex _mutex; // Public functions are protected with the mutex. int _transaction; - bool _possibleUpgradeFromMirall_1_5; - bool _possibleUpgradeFromMirall_1_8_0; QScopedPointer _getFileRecordQuery; QScopedPointer _setFileRecordQuery; QScopedPointer _getDownloadInfoQuery; diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp index 3a7849773..a388f3c4c 100644 --- a/src/libsync/theme.cpp +++ b/src/libsync/theme.cpp @@ -241,12 +241,17 @@ QString Theme::updateCheckUrl() const return QLatin1String("https://updates.owncloud.com/client/"); } +QString Theme::transmissionChecksum() const +{ + return QString::null; // No transmission by default. +} + QString Theme::gitSHA1() const { QString devString; #ifdef GIT_SHA1 const QString githubPrefix(QLatin1String( - "https://github.com/owncloud/mirall/commit/")); + "https://github.com/owncloud/client/commit/")); const QString gitSha1(QLatin1String(GIT_SHA1)); devString = QCoreApplication::translate("ownCloudTheme::about()", "

Built from Git revision %2" @@ -389,5 +394,5 @@ bool Theme::wizardSelectiveSyncDefaultNothing() const } -} // end namespace mirall +} // end namespace client diff --git a/src/libsync/theme.h b/src/libsync/theme.h index 975e23452..7f30950aa 100644 --- a/src/libsync/theme.h +++ b/src/libsync/theme.h @@ -189,12 +189,19 @@ public: */ virtual QString updateCheckUrl() const; - /** * When true, the setup wizard will show the selective sync dialog by default and default * to nothing selected */ virtual bool wizardSelectiveSyncDefaultNothing() const; + /** + * @brief Add an additional checksum header to PUT requests and compare them + * if they come with GET requests. + * This value sets the checksum type (SHA1, MD5 or Adler32) or is left empty + * if no checksumming is wanted. In that case it can still be overwritten in + * the client config file. + */ + virtual QString transmissionChecksum() const; protected: #ifndef TOKEN_AUTH_ONLY diff --git a/src/libsync/transmissionchecksumvalidator.cpp b/src/libsync/transmissionchecksumvalidator.cpp new file mode 100644 index 000000000..271ff6118 --- /dev/null +++ b/src/libsync/transmissionchecksumvalidator.cpp @@ -0,0 +1,151 @@ +/* + * Copyright (C) by Klaas Freitag + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ +#include "config.h" +#include "filesystem.h" +#include "transmissionchecksumvalidator.h" +#include "syncfileitem.h" +#include "propagatorjobs.h" +#include "configfile.h" + +#include + +namespace OCC { + +TransmissionChecksumValidator::TransmissionChecksumValidator(const QString& filePath, QObject *parent) + :QObject(parent), + _filePath(filePath) +{ + +} + +void TransmissionChecksumValidator::setChecksumType( const QByteArray& type ) +{ + _checksumType = type; +} + +QString TransmissionChecksumValidator::checksumType() const +{ + QString checksumType = _checksumType; + if( checksumType.isEmpty() ) { + ConfigFile cfg; + checksumType = cfg.transmissionChecksum(); + } + + return checksumType; +} + +void TransmissionChecksumValidator::uploadValidation() +{ + const QString csType = checksumType(); + + if( csType.isEmpty() ) { + // if there is no checksum defined, continue to upload + emit validated(QByteArray()); + } else { + // Calculate the checksum in a different thread first. + + connect( &_watcher, SIGNAL(finished()), + this, SLOT(slotUploadChecksumCalculated())); + if( csType == checkSumMD5C ) { + _checksumHeader = checkSumMD5C; + _checksumHeader += ":"; + _watcher.setFuture(QtConcurrent::run(FileSystem::calcMd5, _filePath)); + + } else if( csType == checkSumSHA1C ) { + _checksumHeader = checkSumSHA1C; + _checksumHeader += ":"; + _watcher.setFuture(QtConcurrent::run( FileSystem::calcSha1, _filePath)); + } +#ifdef ZLIB_FOUND + else if( csType == checkSumAdlerC) { + _checksumHeader = checkSumAdlerC; + _checksumHeader += ":"; + _watcher.setFuture(QtConcurrent::run(FileSystem::calcAdler32, _filePath)); + } +#endif + else { + // for an unknown checksum, continue to upload + emit validated(QByteArray()); + } + } +} + +void TransmissionChecksumValidator::slotUploadChecksumCalculated( ) +{ + QByteArray checksum = _watcher.future().result(); + + if( !checksum.isEmpty() ) { + checksum.prepend( _checksumHeader ); + } + + emit validated(checksum); +} + + +void TransmissionChecksumValidator::downloadValidation( const QByteArray& checksumHeader ) +{ + // if the incoming header is empty, there was no checksum header, and + // no validation can happen. Just continue. + const QString csType = checksumType(); + + // for empty checksum type, everything is valid. + if( csType.isEmpty() ) { + emit validated(QByteArray()); + return; + } + + int indx = checksumHeader.indexOf(':'); + if( indx < 0 ) { + qDebug() << "Checksum header malformed:" << checksumHeader; + emit validationFailed(tr("The checksum header is malformed.")); // show must go on - even not validated. + return; + } + + const QByteArray type = checksumHeader.left(indx).toUpper(); + _expectedHash = checksumHeader.mid(indx+1); + + connect( &_watcher, SIGNAL(finished()), this, SLOT(slotDownloadChecksumCalculated()) ); + + // start the calculation in different thread + if( type == checkSumMD5C ) { + _watcher.setFuture(QtConcurrent::run(FileSystem::calcMd5, _filePath)); + } else if( type == checkSumSHA1C ) { + _watcher.setFuture(QtConcurrent::run(FileSystem::calcSha1, _filePath)); + } +#ifdef ZLIB_FOUND + else if( type == checkSumAdlerUpperC ) { + _watcher.setFuture(QtConcurrent::run(FileSystem::calcAdler32, _filePath)); + } +#endif + else { + qDebug() << "Unknown checksum type" << type; + emit validationFailed(tr("The checksum header is malformed.")); + return; + } +} + +void TransmissionChecksumValidator::slotDownloadChecksumCalculated() +{ + const QByteArray hash = _watcher.future().result(); + + if( hash != _expectedHash ) { + emit validationFailed(tr("The downloaded file does not match the checksum, it will be resumed.")); + } else { + // qDebug() << "Checksum checked and matching: " << _expectedHash; + emit validated(hash); + } +} + + +} diff --git a/src/libsync/transmissionchecksumvalidator.h b/src/libsync/transmissionchecksumvalidator.h new file mode 100644 index 000000000..24a289d7e --- /dev/null +++ b/src/libsync/transmissionchecksumvalidator.h @@ -0,0 +1,74 @@ +/* + * Copyright (C) by Klaas Freitag + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + +#pragma once + +#include +#include +#include + +namespace OCC { + +class TransmissionChecksumValidator : public QObject +{ + Q_OBJECT +public: + explicit TransmissionChecksumValidator(const QString& filePath, QObject *parent = 0); + + /** + * method to prepare a checksum for transmission and save it to the _checksum + * member of the SyncFileItem *item. + * The kind of requested checksum is taken from config. No need to set from outside. + * + * In any case of processing (checksum set, no checksum required and also unusual error) + * the object will emit the signal validated(). The item->_checksum is than either + * set to a proper value or empty. + */ + void uploadValidation(); + + /** + * method to verify the checksum coming with requests in a checksum header. The required + * checksum method is read from config. + * + * If no checksum is there, or if a correct checksum is there, the signal validated() + * will be emitted. In case of any kind of error, the signal validationFailed() will + * be emitted. + */ + void downloadValidation( const QByteArray& checksumHeader ); + + // This is only used in test cases (by now). This class reads the required + // test case from the config file. + void setChecksumType(const QByteArray &type ); + QString checksumType() const; + +signals: + void validated(const QByteArray& checksum); + void validationFailed( const QString& errMsg ); + +private slots: + void slotUploadChecksumCalculated(); + void slotDownloadChecksumCalculated(); + +private: + QByteArray _checksumType; + QByteArray _expectedHash; + QByteArray _checksumHeader; + + QString _filePath; + + // watcher for the checksum calculation thread + QFutureWatcher _watcher; +}; + +} diff --git a/src/libsync/utility.cpp b/src/libsync/utility.cpp index ce9aa2e78..42da7d6c3 100644 --- a/src/libsync/utility.cpp +++ b/src/libsync/utility.cpp @@ -15,6 +15,7 @@ #include "utility.h" #include "version.h" +#include "theme.h" // Note: This file must compile without QtGui #include @@ -154,10 +155,19 @@ QString Utility::platform() QByteArray Utility::userAgentString() { - return QString::fromLatin1("Mozilla/5.0 (%1) mirall/%2") + QString re = QString::fromLatin1("Mozilla/5.0 (%1) mirall/%2") .arg(Utility::platform()) - .arg(QLatin1String(MIRALL_STRINGIFY(MIRALL_VERSION))) - .toLatin1(); + .arg(QLatin1String(MIRALL_STRINGIFY(MIRALL_VERSION))); + + const QString appName = Theme::instance()->appName(); + + // this constant "ownCloud" is defined in the default OEM theming + // that is used for the standard client. If it is changed there, + // it needs to be adjusted here. + if( appName != QLatin1String("ownCloud") ) { + re += QString(" (%1)").arg(appName); + } + return re.toLatin1(); } bool Utility::hasLaunchOnStartup(const QString &appName) @@ -401,10 +411,12 @@ void Utility::StopWatch::start() _timer.start(); } -void Utility::StopWatch::stop() +quint64 Utility::StopWatch::stop() { addLapTime(QLatin1String(STOPWATCH_END_TAG)); + quint64 duration = _timer.elapsed(); _timer.invalidate(); + return duration; } void Utility::StopWatch::reset() diff --git a/src/libsync/utility.h b/src/libsync/utility.h index a9e8bb748..56c241da5 100644 --- a/src/libsync/utility.h +++ b/src/libsync/utility.h @@ -105,7 +105,7 @@ namespace Utility QElapsedTimer _timer; public: void start(); - void stop(); + quint64 stop(); quint64 addLapTime( const QString& lapName ); void reset(); diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f1d44061b..ef64f5d2d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -33,4 +33,6 @@ owncloud_add_test(SyncFileItem "") owncloud_add_test(ConcatUrl "") owncloud_add_test(XmlParse "") +owncloud_add_test(FileSystem "") +owncloud_add_test(TransChecksumValidator "") diff --git a/test/testfilesystem.h b/test/testfilesystem.h new file mode 100644 index 000000000..e824edc0f --- /dev/null +++ b/test/testfilesystem.h @@ -0,0 +1,93 @@ +/* + This software is in the public domain, furnished "as is", without technical + support, and with no warranty, express or implied, as to its usefulness for + any purpose. +*/ + +#ifndef MIRALL_TESTFILESYSTEM_H +#define MIRALL_TESTFILESYSTEM_H + +#include +#include + +#include "filesystem.h" +#include "utility.h" + +using namespace OCC::Utility; +using namespace OCC::FileSystem; + +class TestFileSystem : public QObject +{ + Q_OBJECT + + QString _root; + + + QByteArray shellSum( const QByteArray& cmd, const QString& file ) + { + QProcess md5; + QStringList args; + args.append(file); + md5.start(cmd, args); + QByteArray sumShell; + qDebug() << "File: "<< file; + + if( md5.waitForFinished() ) { + + sumShell = md5.readAll(); + sumShell = sumShell.left( sumShell.indexOf(' ')); + } + return sumShell; + } + +private slots: + void initTestCase() { + qsrand(QTime::currentTime().msec()); + + QString subdir("test_"+QString::number(qrand())); + _root = QDir::tempPath() + "/" + subdir; + + QDir dir("/tmp"); + dir.mkdir(subdir); + qDebug() << "creating test directory " << _root; + } + + void cleanupTestCase() + { + if( !_root.isEmpty() ) + system(QString("rm -rf "+_root).toUtf8()); + } + + void testMd5Calc() + { + QString file( _root+"/file_a.bin"); + writeRandomFile(file); + QFileInfo fi(file); + QVERIFY(fi.exists()); + QByteArray sum = calcMd5(file); + + QByteArray sSum = shellSum("/usr/bin/md5sum", file); + qDebug() << "calulated" << sum << "versus md5sum:"<< sSum; + QVERIFY(!sSum.isEmpty()); + QVERIFY(!sum.isEmpty()); + QVERIFY(sSum == sum ); + } + + void testSha1Calc() + { + QString file( _root+"/file_b.bin"); + writeRandomFile(file); + QFileInfo fi(file); + QVERIFY(fi.exists()); + QByteArray sum = calcSha1(file); + + QByteArray sSum = shellSum("/usr/bin/sha1sum", file); + qDebug() << "calulated" << sum << "versus sha1sum:"<< sSum; + QVERIFY(!sSum.isEmpty()); + QVERIFY(!sum.isEmpty()); + QVERIFY(sSum == sum ); + } + +}; + +#endif diff --git a/test/testowncloudpropagator.h b/test/testowncloudpropagator.h index 1ffa66a66..24cdcdcd6 100644 --- a/test/testowncloudpropagator.h +++ b/test/testowncloudpropagator.h @@ -14,7 +14,7 @@ using namespace OCC; namespace OCC { -QString createDownloadTmpFileName(const QString &previous); +QString OWNCLOUDSYNC_EXPORT createDownloadTmpFileName(const QString &previous); } class TestOwncloudPropagator : public QObject diff --git a/test/testtranschecksumvalidator.h b/test/testtranschecksumvalidator.h new file mode 100644 index 000000000..5f0ac77b0 --- /dev/null +++ b/test/testtranschecksumvalidator.h @@ -0,0 +1,159 @@ +/* + * This software is in the public domain, furnished "as is", without technical + * support, and with no warranty, express or implied, as to its usefulness for + * any purpose. + * + */ + +#pragma once + +#include +#include +#include + +#include "transmissionchecksumvalidator.h" +#include "networkjobs.h" +#include "utility.h" +#include "filesystem.h" +#include "propagatorjobs.h" + +using namespace OCC; + + class TestTransChecksumValidator : public QObject + { + Q_OBJECT + + private: + QString _root; + QString _testfile; + QString _expectedError; + QEventLoop _loop; + QByteArray _expected; + bool _successDown; + bool _errorSeen; + + void processAndWait() { + _loop.processEvents(); + Utility::usleep(200000); + _loop.processEvents(); + } + + public slots: + + void slotUpValidated(const QByteArray& checksum) { + qDebug() << "Checksum: " << checksum; + QVERIFY(_expected == checksum ); + } + + void slotDownValidated() { + _successDown = true; + } + + void slotDownError( const QString& errMsg ) { + QVERIFY(_expectedError == errMsg ); + _errorSeen = true; + } + + private slots: + + void initTestCase() { + qDebug() << Q_FUNC_INFO; + _root = QDir::tempPath() + "/" + "test_" + QString::number(qrand()); + QDir rootDir(_root); + + rootDir.mkpath(_root ); + _testfile = _root+"/csFile"; + Utility::writeRandomFile( _testfile); + + } + + void testUploadChecksummingAdler() { + + TransmissionChecksumValidator *vali = new TransmissionChecksumValidator(_testfile, this); + vali->setChecksumType("Adler32"); + + connect(vali, SIGNAL(validated(QByteArray)), this, SLOT(slotUpValidated(QByteArray))); + + QString testfile = _testfile; + _expected = "Adler32:"+FileSystem::calcAdler32( testfile ); + qDebug() << "XX Expected Checksum: " << _expected; + vali->uploadValidation(); + + usleep(5000); + + _loop.processEvents(); + delete vali; + } + + void testUploadChecksummingMd5() { + + TransmissionChecksumValidator *vali = new TransmissionChecksumValidator(_testfile, this); + vali->setChecksumType( OCC::checkSumMD5C ); + connect(vali, SIGNAL(validated(QByteArray)), this, SLOT(slotUpValidated(QByteArray))); + + _expected = checkSumMD5C; + _expected.append(":"+FileSystem::calcMd5( _testfile )); + vali->uploadValidation(); + + usleep(2000); + + _loop.processEvents(); + delete vali; + } + + void testUploadChecksummingSha1() { + + TransmissionChecksumValidator *vali = new TransmissionChecksumValidator(_testfile, this); + vali->setChecksumType( OCC::checkSumSHA1C ); + connect(vali, SIGNAL(validated(QByteArray)), this, SLOT(slotUpValidated(QByteArray))); + + _expected = checkSumSHA1C; + _expected.append(":"+FileSystem::calcSha1( _testfile )); + + vali->uploadValidation(); + + usleep(2000); + + _loop.processEvents(); + delete vali; + } + + void testDownloadChecksummingAdler() { + + QByteArray adler = checkSumAdlerC; + adler.append(":"); + adler.append(FileSystem::calcAdler32( _testfile )); + _successDown = false; + + TransmissionChecksumValidator *vali = new TransmissionChecksumValidator(_testfile, this); + vali->setChecksumType("Adler32"); + connect(vali, SIGNAL(validated(QByteArray)), this, SLOT(slotDownValidated())); + connect(vali, SIGNAL(validationFailed(QString)), this, SLOT(slotDownError(QString))); + vali->downloadValidation(adler); + + usleep(2000); + + _loop.processEvents(); + QVERIFY(_successDown); + + _expectedError = QLatin1String("The downloaded file does not match the checksum, it will be resumed."); + _errorSeen = false; + vali->downloadValidation("Adler32:543345"); + usleep(2000); + _loop.processEvents(); + QVERIFY(_errorSeen); + + _expectedError = QLatin1String("The checksum header is malformed."); + _errorSeen = false; + vali->downloadValidation("Klaas32:543345"); + usleep(2000); + _loop.processEvents(); + QVERIFY(_errorSeen); + + delete vali; + } + + + void cleanupTestCase() { + } +}; diff --git a/translations/client_ca.ts b/translations/client_ca.ts index 7eab94fd8..b8081ca8c 100644 --- a/translations/client_ca.ts +++ b/translations/client_ca.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time @@ -81,53 +81,53 @@ Connectat amb <server> com a <user> - + Add Folder... Afegeix carpeta... - + Pause Pausa - + Remove Elimina - + Choose What to Sync Selecciona el que vulguis sincronitzar - + Storage Usage Ús de l'emmagatzemament - + Retrieving usage information... Obtenint informació de l'ús... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Nota</b> Algunes carpetes, incloent els fitxers muntats a través de xarxa o compartits, poden tenir límits diferents. - + Account Maintenance Manteniment del compte - + Edit Ignored Files Edita fitxers ignorats - + Modify Account Modifica el compte @@ -714,22 +714,22 @@ Esteu segur que voleu executar aquesta operació? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway No s'ha rebut cap E-Tag del servidor, comproveu el Proxy/Gateway - + We received a different E-Tag for resuming. Retrying next time. Hem rebut un E-Tag diferent en la represa. Es comprovarà la pròxima vegada. - + Server returned wrong content-range El servidor retorna un error de contingut o rang - + Connection Timeout Temps de connexió excedit @@ -1397,7 +1397,7 @@ No és aconsellada usar-la. OCC::PUTFileJob - + Connection Timeout Temps de connexió excedit @@ -1405,7 +1405,7 @@ No és aconsellada usar-la. OCC::PollJob - + Invalid JSON reply from the poll URL @@ -1441,22 +1441,22 @@ No és aconsellada usar-la. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! El fitxer %1 no es pot baixar perquè hi ha un xoc amb el nom d'un fitxer local! - + The file could not be downloaded completely. - + File %1 cannot be saved because of a local file name clash! - + File has changed since discovery @@ -1584,38 +1584,43 @@ No és aconsellada usar-la. OCC::PropagateUploadFileQNAM - + File Removed - - + + Local file changed during syncing. It will be resumed. + + + + + Local file changed during sync. El fitxer local ha canviat durant la sincronització. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. El fitxer s'ha editat localment però és part d'una compartició només de lectura. S'ha restaurat i la vostra edició és en el fitxer en conflicte. - + Poll URL missing - + The local file was removed during sync. El fitxer local s'ha eliminat durant la sincronització. - + The server did not acknowledge the last chunk. (No e-tag were present) El servidor no ha reconegut l'últim fragment. (No hi havia e-Tag) @@ -2357,69 +2362,69 @@ No és aconsellada usar-la. - + Unable to initialize a sync journal. No es pot inicialitzar un periòdic de sincronització - + Cannot open the sync journal No es pot obrir el diari de sincronització - - + + Ignored because of the "choose what to sync" blacklist - + Not allowed because you don't have permission to add sub-directories in that directory No es permet perquè no teniu permisos per afegir subcarpetes en aquesta carpeta - + Not allowed because you don't have permission to add parent directory No es permet perquè no teniu permisos per afegir una carpeta inferior - + Not allowed because you don't have permission to add files in that directory No es permet perquè no teniu permisos per afegir fitxers en aquesta carpeta - + Not allowed to upload this file because it is read-only on the server, restoring No es permet pujar aquest fitxer perquè només és de lectura en el servidor, es restaura - - + + Not allowed to remove, restoring No es permet l'eliminació, es restaura - + Local files and share folder removed. Fitxers locals i carpeta compartida esborrats. - + Move not allowed, item restored No es permet moure'l, l'element es restaura - + Move not allowed because %1 is read-only No es permet moure perquè %1 només és de lectura - + the destination el destí - + the source l'origen @@ -2435,21 +2440,35 @@ No és aconsellada usar-la. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + + + + + The downloaded file does not match the checksum, it will be resumed. + + + OCC::ownCloudGui @@ -2722,8 +2741,8 @@ No és aconsellada usar-la. Etiqueta d'error - - + + TextLabel TextLabel @@ -2843,27 +2862,27 @@ No és aconsellada usar-la. Utility - + %L1 TiB %L1 TiB - + %L1 GiB %L1 GiB - + %L1 MiB %L1 MiB - + %L1 KiB %L1 KiB - + %L1 B %L1 B @@ -2884,7 +2903,7 @@ No és aconsellada usar-la. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> <p><small>Construït de la revisió de Git <a href="%1">%2</a> el %4 de %3 usant Qt %5, %6</small></p> diff --git a/translations/client_cs.ts b/translations/client_cs.ts index 156c4ee84..815056646 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time Cílový soubor má neočekávanou velikost nebo čas změny @@ -81,53 +81,53 @@ Připojen k <server> jako <user> - + Add Folder... Přidat složku... - + Pause Pozastavit - + Remove Odebrat - + Choose What to Sync Vybrat co synchronizovat - + Storage Usage Obsazený prostor - + Retrieving usage information... Zjišťuji obsazený prostor... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Poznámka:</b> Některé složky, včetně síťových či sdílených složek, mohou mít jiné limity. - + Account Maintenance Správa účtu - + Edit Ignored Files Editovat ignorované soubory - + Modify Account Upravit účet @@ -713,22 +713,22 @@ Opravdu chcete provést tuto akci? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Ze serveru nebyl obdržen E-Tag, zkontrolujte proxy/bránu - + We received a different E-Tag for resuming. Retrying next time. Obdrželi jsme jiný E-Tag pro pokračování. Zkusím znovu příště. - + Server returned wrong content-range Server odpověděl chybným rozsahem obsahu - + Connection Timeout Čas spojení vypršel @@ -1396,7 +1396,7 @@ Nedoporučuje se jí používat. OCC::PUTFileJob - + Connection Timeout Čas spojení vypršel @@ -1404,7 +1404,7 @@ Nedoporučuje se jí používat. OCC::PollJob - + Invalid JSON reply from the poll URL Neplatná JSON odpověď z adresy URL @@ -1440,22 +1440,22 @@ Nedoporučuje se jí používat. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! Soubor %1 nemohl být stažen z důvodu kolize názvu se souborem v místním systému! - + The file could not be downloaded completely. Soubor nemohl být kompletně stažen. - + File %1 cannot be saved because of a local file name clash! Soubor %1 nemohl být uložen z důvodu kolize názvu se souborem v místním systému! - + File has changed since discovery Soubor se mezitím změnil @@ -1583,38 +1583,43 @@ Nedoporučuje se jí používat. OCC::PropagateUploadFileQNAM - + File Removed Soubor odebrán - - + + Local file changed during syncing. It will be resumed. + + + + + Local file changed during sync. Místní soubor byl změněn během synchronizace. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. Vynucené ukončení procesu při resetu HTTP připojení s Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. Soubor zde byl editován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven a editovaná verze je uložena v konfliktním souboru. - + Poll URL missing Chybí adresa URL - + The local file was removed during sync. Místní soubor byl odstraněn během synchronizace. - + The server did not acknowledge the last chunk. (No e-tag were present) Server nepotvrdil poslední část dat. (Nebyl nalezen e-tag) @@ -2362,69 +2367,69 @@ Nedoporučuje se jí používat. Kódování znaků jména soubor je neplatné - + Unable to initialize a sync journal. Nemohu inicializovat synchronizační žurnál. - + Cannot open the sync journal Nelze otevřít synchronizační žurnál - - + + Ignored because of the "choose what to sync" blacklist Ignorováno podle nastavení "vybrat co synchronizovat" - + Not allowed because you don't have permission to add sub-directories in that directory Není povoleno, protože nemáte oprávnění vytvářet podadresáře v tomto adresáři - + Not allowed because you don't have permission to add parent directory Není povoleno, protože nemáte oprávnění vytvořit rodičovský adresář - + Not allowed because you don't have permission to add files in that directory Není povoleno, protože nemáte oprávnění přidávat soubory do tohoto adresáře - + Not allowed to upload this file because it is read-only on the server, restoring Není povoleno nahrát tento soubor, protože je na serveru uložen pouze pro čtení, obnovuji - - + + Not allowed to remove, restoring Odstranění není povoleno, obnovuji - + Local files and share folder removed. Místní soubory a sdílená složka byly odstraněny. - + Move not allowed, item restored Přesun není povolen, položka obnovena - + Move not allowed because %1 is read-only Přesun není povolen, protože %1 je pouze pro čtení - + the destination cílové umístění - + the source zdroj @@ -2440,21 +2445,35 @@ Nedoporučuje se jí používat. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> <p>Verze %1. Více informací na <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> <p>Copyright ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> <p>Šíří %1 pod licencí GNU General Public License (GPL) Verze 2.0.<br/>%2 a %2 logo jsou registrované známky %1 ve Spojených Státech, ostatních zemích, nebo obojí.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + + + + + The downloaded file does not match the checksum, it will be resumed. + + + OCC::ownCloudGui @@ -2727,8 +2746,8 @@ Nedoporučuje se jí používat. Chybový popis - - + + TextLabel Textový štítek @@ -2848,27 +2867,27 @@ Nedoporučuje se jí používat. Utility - + %L1 TiB %L1 TiB - + %L1 GiB %L1 GiB - + %L1 MiB %L1 MiB - + %L1 KiB %L1 KiB - + %L1 B %L1 B @@ -2889,7 +2908,7 @@ Nedoporučuje se jí používat. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> <p><small>Sestaveno na Git revizi <a href="%1">%2</a> na %3, %4 s použitím Qt %5, %6</small></p> diff --git a/translations/client_de.ts b/translations/client_de.ts index 9e7e0eab1..6157391ae 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time Die Zieldatei hat eine unerwartete Größe oder ein unerwartetes Änderungsdatum @@ -81,53 +81,53 @@ Verbunden mit <server> als <user> - + Add Folder... Ordner hinzufügen… - + Pause Anhalten - + Remove Entfernen - + Choose What to Sync Zu synchronisierende Elemente auswählen - + Storage Usage Speicherbelegung - + Retrieving usage information... Nutzungsinformationen werden abgerufen… - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Hinweis:</b> Einige Ordner, einschließlich über das Netzwerk verbundene oder freigegebene Ordner, können unterschiedliche Beschränkungen haben. - + Account Maintenance Kontoverwaltung - + Edit Ignored Files Ignorierte Dateien bearbeiten - + Modify Account Konto bearbeiten @@ -170,7 +170,7 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf The syncing operation is running.<br/>Do you want to terminate it? - Die Synchronistation läuft gerade.<br/>Wollen Sie sie beenden? + Die Synchronisation läuft gerade.<br/>Wollen Sie sie beenden? @@ -714,22 +714,22 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Kein E-Tag vom Server empfangen, bitte Proxy / Gateway überprüfen - + We received a different E-Tag for resuming. Retrying next time. Es wurde ein unterschiedlicher E-Tag zum Fortfahren empfangen. Bitte beim nächsten mal nochmal versuchen. - + Server returned wrong content-range Server hat falschen Bereich für den Inhalt zurück gegeben - + Connection Timeout Zeitüberschreitung der Verbindung @@ -1396,7 +1396,7 @@ Es ist nicht ratsam, diese zu benutzen. OCC::PUTFileJob - + Connection Timeout Zeitüberschreitung der Verbindung @@ -1404,7 +1404,7 @@ Es ist nicht ratsam, diese zu benutzen. OCC::PollJob - + Invalid JSON reply from the poll URL Ungültige JSON-Antwort von der Poll-URL @@ -1440,22 +1440,22 @@ Es ist nicht ratsam, diese zu benutzen. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht herunter geladen werden! - + The file could not be downloaded completely. Die Datei konnte nicht vollständig herunter geladen werden. - + File %1 cannot be saved because of a local file name clash! Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht gespeichert geladen werden! - + File has changed since discovery Datei ist seit der Entdeckung geändert worden @@ -1583,38 +1583,43 @@ Es ist nicht ratsam, diese zu benutzen. OCC::PropagateUploadFileQNAM - + File Removed Datei gelöscht - - + + Local file changed during syncing. It will be resumed. + Lokale Datei hat sich während der Synchronisation geändert. Die Synchronisation wird wiederaufgenommen. + + + + Local file changed during sync. Eine lokale Datei wurde während der Synchronisation geändert. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + Auftragsabbruch beim Rücksetzen der HTTP-Verbindung mit QT < 5.4.2 wird erzwungen. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. Die Datei wurde von einer Nur-Lese-Freigabe lokal bearbeitet. Die Datei wurde wiederhergestellt und Ihre Bearbeitung ist in der Konflikte-Datei. - + Poll URL missing Poll-URL fehlt - + The local file was removed during sync. Die lokale Datei wurde während der Synchronisation gelöscht. - + The server did not acknowledge the last chunk. (No e-tag were present) Der Server hat den letzten Block nicht bestätigt. (Der E-Tag war nicht vorhanden) @@ -2361,69 +2366,69 @@ Es ist nicht ratsam, diese zu benutzen. Dateikodierung ist ungültig - + Unable to initialize a sync journal. Synchronisationsbericht konnte nicht initialisiert werden. - + Cannot open the sync journal Synchronisationsbericht kann nicht geöffnet werden - - + + Ignored because of the "choose what to sync" blacklist Aufgrund der »Zu synchronisierende Elemente auswählen«-Sperrliste ignoriert - + Not allowed because you don't have permission to add sub-directories in that directory Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben - + Not allowed because you don't have permission to add parent directory Nicht erlaubt, da Sie keine Rechte zur Erstellung von Hauptordnern haben - + Not allowed because you don't have permission to add files in that directory Nicht erlaubt, da Sie keine Rechte zum Hinzufügen von Dateien in diesen Ordner haben - + Not allowed to upload this file because it is read-only on the server, restoring Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist, Wiederherstellung - - + + Not allowed to remove, restoring Löschen nicht erlaubt, Wiederherstellung - + Local files and share folder removed. Lokale Dateien und Freigabeordner wurden entfernt. - + Move not allowed, item restored Verschieben nicht erlaubt, Element wiederhergestellt - + Move not allowed because %1 is read-only Verschieben nicht erlaubt, da %1 schreibgeschützt ist - + the destination Das Ziel - + the source Die Quelle @@ -2439,21 +2444,35 @@ Es ist nicht ratsam, diese zu benutzen. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> <p>Version %1. Für weitere Informationen besuchen Sie bitte <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> <p>Copyright ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> <p>Zur Verfügung gestellt durch %1 und lizenziert unter der GNU General Public License (GPL) Version 2.0.<br>%2 und das %2 Logo sind eingetragene Warenzeichen von %1 in den Vereinigten Staaten, anderen Ländern oder beides.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + Der Prüfsummen-Header hat ein fehlerhaftes Format. + + + + The downloaded file does not match the checksum, it will be resumed. + Die heruntergeladene Datei entspricht nicht der Prüfsumme, das Herunterladen wird wiederaufgenommen. + + OCC::ownCloudGui @@ -2726,8 +2745,8 @@ Es ist nicht ratsam, diese zu benutzen. Fehler-Label - - + + TextLabel TextLabel @@ -2847,27 +2866,27 @@ Es ist nicht ratsam, diese zu benutzen. Utility - + %L1 TiB %L1 TiB - + %L1 GiB %L1 GiB - + %L1 MiB %L1 MiB - + %L1 KiB %L1 KiB - + %L1 B %L1 B @@ -2888,7 +2907,7 @@ Es ist nicht ratsam, diese zu benutzen. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> <p><small>Gebaut von der GIT-Revision <a href="%1">%2</a> auf %3, %4 verwendet Qt %5, %6</small></p> diff --git a/translations/client_el.ts b/translations/client_el.ts index eb3b4dd32..2f59e15d9 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time Το αρχείο προορισμού έχει μη αναμενόμενο μέγεθος ή χρόνο τροποποίησης @@ -81,53 +81,53 @@ Συνδεδεμένοι με το <server> ως <user> - + Add Folder... Προσθήκη φακέλου... - + Pause Παύση - + Remove Αφαίρεση - + Choose What to Sync Επιλέξτε Τι θα Συγχρονιστεί - + Storage Usage Χρήση Αποθηκευτικού Χώρου - + Retrieving usage information... Λήψη πληροφοριών χρήσης... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Σημείωση:</b> Κάποιοι φάκελοι, συμπεριλαμβανομένων των δικτυακών δίσκων ή των κοινόχρηστων φακέλων, μπορεί να έχουν διαφορετικά όρια. - + Account Maintenance Συντήρηση Λογαριασμού - + Edit Ignored Files Επεξεργασία Αρχείων προς Αγνόηση - + Modify Account Τροποποίηση Λογαριασμού @@ -714,22 +714,22 @@ Are you sure you want to perform this operation? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Δεν ελήφθη E-Tag από το διακομιστή, ελέγξτε το διακομιστή μεσολάβησης/πύλη - + We received a different E-Tag for resuming. Retrying next time. Ελήφθη διαφορετικό E-Tag για συνέχιση. Επανάληψη την επόμενη φορά. - + Server returned wrong content-range Ο διακομιστής επέστρεψε εσφαλμένο πεδίο τιμών - + Connection Timeout Λήξη Χρόνου Αναμονής Σύνδεσης @@ -1397,7 +1397,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout Λήξη Χρόνου Αναμονής Σύνδεσης @@ -1405,7 +1405,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL Λανθασμένη απάντηση JSON από την ιστοσελίδα poll @@ -1441,22 +1441,22 @@ It is not advisable to use it. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! Το αρχείο %1 δεν είναι δυνατό να ληφθεί λόγω διένεξης με το όνομα ενός τοπικού αρχείου! - + The file could not be downloaded completely. Η λήψη του αρχείου δεν ολοκληρώθηκε. - + File %1 cannot be saved because of a local file name clash! Το αρχείο %1 δεν είναι δυνατό να αποθηκευτεί λόγω διένεξης με το όνομα ενός τοπικού ονόματος αρχείου! - + File has changed since discovery Το αρχείο έχει αλλάξει από όταν ανακαλύφθηκε @@ -1584,38 +1584,43 @@ It is not advisable to use it. OCC::PropagateUploadFileQNAM - + File Removed Το αρχείο αφαιρέθηκε - - + + Local file changed during syncing. It will be resumed. + Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού. Θα συγχρονιστεί πάλι. + + + + Local file changed during sync. Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. Εξαναγκασμός ακύρωσης εργασίας στην επαναφορά σύνδεσης HTTP με Qt < 5.4.2 - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. Το αρχείο υπέστη επεξεργασία τοπικά αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Επαναφέρθηκε και το επεξεργασμένο βρίσκεται στο αρχείο συγκρούσεων. - + Poll URL missing Η διεύθυνση poll URL λείπει - + The local file was removed during sync. Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό. - + The server did not acknowledge the last chunk. (No e-tag were present) Ο διακομιστής δεν αναγνώρισε το τελευταίο τμήμα. (Δεν υπήρχε e-tag) @@ -2363,69 +2368,69 @@ It is not advisable to use it. Η κωδικοποίηση του ονόματος αρχείου δεν είναι έγκυρη - + Unable to initialize a sync journal. Αδυναμία προετοιμασίας αρχείου συγχρονισμού. - + Cannot open the sync journal Αδυναμία ανοίγματος του αρχείου συγχρονισμού - - + + Ignored because of the "choose what to sync" blacklist Αγνοήθηκε εξαιτίας της μαύρης λίστας "διάλεξε τι να συγχρονιστεί" - + Not allowed because you don't have permission to add sub-directories in that directory Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε υπο-καταλόγους σε αυτό τον κατάλογο - + Not allowed because you don't have permission to add parent directory Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε στο γονεϊκό κατάλογο - + Not allowed because you don't have permission to add files in that directory Δεν επιτρέπεται επειδή δεν έχεται δικαιώματα να προσθέσετε αρχεία σε αυτόν τον κατάλογο - + Not allowed to upload this file because it is read-only on the server, restoring Δεν επιτρέπεται να μεταφορτώσετε αυτό το αρχείο επειδή είναι μόνο για ανάγνωση στο διακομιστή, αποκατάσταση σε εξέλιξη - - + + Not allowed to remove, restoring Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη - + Local files and share folder removed. Οι τοπικοί φάκελοι και ο φάκελος κοινής χρήσης αφαιρέθηκαν. - + Move not allowed, item restored Η μετακίνηση δεν επιτρέπεται, το αντικείμενο αποκαταστάθηκε - + Move not allowed because %1 is read-only Η μετακίνηση δεν επιτρέπεται επειδή το %1 είναι μόνο για ανάγνωση - + the destination ο προορισμός - + the source η προέλευση @@ -2441,21 +2446,35 @@ It is not advisable to use it. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> <p>Έκδοση %1. Για περισσότερες πληροφορίες δείτε <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> <p>Πνευματικά δικαιώματα ownCloud, Ανώνυμη Εταιρία</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> <p>Διανέμεται από 1% και υπό την άδεια GNU General Public License (GPL) έκδοση 2.0.<br/>% 2 και το 2% το λογότυπο είναι σήματα κατατεθέντα της 1% στις Ηνωμένες Πολιτείες, άλλες χώρες, ή και τα δύο.</ p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + Η κεφαλίδα του αθροίσματος ελέγχου δεν είναι σωστά διαμορφωμένη. + + + + The downloaded file does not match the checksum, it will be resumed. + Το αρχείο που μεταφορτώθηκε δεν επαληθεύει το άθροισμα ελέγχου, θα συγχρονιστεί πάλι. + + OCC::ownCloudGui @@ -2728,8 +2747,8 @@ It is not advisable to use it. Ετικέτα Σφάλματος - - + + TextLabel TextLabel @@ -2849,27 +2868,27 @@ It is not advisable to use it. Utility - + %L1 TiB %L1 TiB - + %L1 GiB %L1 GiB - + %L1 MiB %L1 MiB - + %L1 KiB %L1 KiB - + %L1 B %L1 B @@ -2890,7 +2909,7 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> <p><small>Δημιουργήθηκε από την διασκευή Git <a href="%1">%2</a> στο %3, %4 χρησιμοποιώντας Qt %5, %6</small></p> diff --git a/translations/client_en.ts b/translations/client_en.ts index b1a120c7c..6158d2f85 100644 --- a/translations/client_en.ts +++ b/translations/client_en.ts @@ -4,7 +4,7 @@ FileSystem - + The destination file has an unexpected size or modification time @@ -83,53 +83,53 @@ - + Add Folder... - + Pause - + Remove - + Choose What to Sync - + Storage Usage - + Retrieving usage information... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. - + Account Maintenance - + Edit Ignored Files - + Modify Account @@ -712,22 +712,22 @@ Are you sure you want to perform this operation? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway - + We received a different E-Tag for resuming. Retrying next time. - + Server returned wrong content-range - + Connection Timeout @@ -1391,7 +1391,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout @@ -1399,7 +1399,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL @@ -1435,22 +1435,22 @@ It is not advisable to use it. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! - + The file could not be downloaded completely. - + File %1 cannot be saved because of a local file name clash! - + File has changed since discovery @@ -1578,38 +1578,43 @@ It is not advisable to use it. OCC::PropagateUploadFileQNAM - + File Removed - - + + Local file changed during syncing. It will be resumed. + + + + + Local file changed during sync. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. - + Poll URL missing - + The local file was removed during sync. - + The server did not acknowledge the last chunk. (No e-tag were present) @@ -2355,69 +2360,69 @@ It is not advisable to use it. - + Unable to initialize a sync journal. - + Cannot open the sync journal - - + + Ignored because of the "choose what to sync" blacklist - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Local files and share folder removed. - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2433,21 +2438,35 @@ It is not advisable to use it. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + + + + + The downloaded file does not match the checksum, it will be resumed. + + + OCC::ownCloudGui @@ -2720,8 +2739,8 @@ It is not advisable to use it. - - + + TextLabel @@ -2841,27 +2860,27 @@ It is not advisable to use it. Utility - + %L1 TiB - + %L1 GiB - + %L1 MiB - + %L1 KiB - + %L1 B @@ -2882,7 +2901,7 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> diff --git a/translations/client_es.ts b/translations/client_es.ts index 05c5e4279..c2b3f02b1 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time El archivo destino tiene un tamaño o fecha/hora de modificación no esperado. @@ -81,53 +81,53 @@ Conectado a <server> como <user> - + Add Folder... Agregar carpeta... - + Pause Pausa - + Remove Eliminar - + Choose What to Sync Escoja qué sincronizar - + Storage Usage Uso de almacenamiento - + Retrieving usage information... Obteniendo información de uso - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Nota:</b> Algunas carpetas, incluyendo unidades de red o carpetas compartidas, pueden tener límites diferentes. - + Account Maintenance Mantenimiento de cuenta - + Edit Ignored Files Editar archivos ignorados - + Modify Account Modificar cuenta @@ -713,22 +713,22 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway No se recibió ninguna e-tag del servidor, revise el proxy/gateway - + We received a different E-Tag for resuming. Retrying next time. Se recibió una e-tag distinta para reanudar. Se intentará nuevamente. - + Server returned wrong content-range El servidor devolvió un content-range erróneo - + Connection Timeout Tiempo de espera de conexión agotado @@ -1395,7 +1395,7 @@ No se recomienda usarla. OCC::PUTFileJob - + Connection Timeout Tiempo de espera de conexión agotado @@ -1403,7 +1403,7 @@ No se recomienda usarla. OCC::PollJob - + Invalid JSON reply from the poll URL Respuesta JSON invalida desde URL @@ -1439,22 +1439,22 @@ No se recomienda usarla. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! ¡El archivo %1 no se puede descargar a causa de un conflicto con el nombre de un archivo local! - + The file could not be downloaded completely. No se pudo descargar el archivo completamente. - + File %1 cannot be saved because of a local file name clash! ¡El fichero %1 no puede guardarse debido a un conflicto con el nombre de otro fichero local! - + File has changed since discovery El archivo ha cambiado desde que fue descubierto @@ -1582,38 +1582,43 @@ No se recomienda usarla. OCC::PropagateUploadFileQNAM - + File Removed Archivo eliminado - - + + Local file changed during syncing. It will be resumed. + Archivo local cambió durante la sincronización. Será actualizado. + + + + Local file changed during sync. Un archivo local fue modificado durante la sincronización. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. Forzar el trabajo en una conexión HTTP, causará un Reset si Qt< 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. El archivo fue modificado localmente; pero es parte de una carpeta compartida en modo de sólo lectura. Ha sido recuperado y su modificación está en el archivo de conflicto. - + Poll URL missing URL de encuesta faltante - + The local file was removed during sync. El archivo local fue eliminado durante la sincronización. - + The server did not acknowledge the last chunk. (No e-tag were present) El servidor no reconoció la última parte. (No había una e-tag presente.) @@ -2358,69 +2363,69 @@ No se recomienda usarla. Los caracteres del nombre de fichero no son válidos - + Unable to initialize a sync journal. No se pudo inicializar un registro (journal) de sincronización. - + Cannot open the sync journal No es posible abrir el diario de sincronización - - + + Ignored because of the "choose what to sync" blacklist Ignorado por que se encuentra en la lista negra de "elija qué va a sincronizar" - + Not allowed because you don't have permission to add sub-directories in that directory No está permitido porque no tiene permisos para añadir subcarpetas en este directorio. - + Not allowed because you don't have permission to add parent directory No está permitido porque no tiene permisos para añadir un directorio - + Not allowed because you don't have permission to add files in that directory No está permitido porque no tiene permisos para crear archivos en este directorio - + Not allowed to upload this file because it is read-only on the server, restoring No está permitido subir este archivo porque es de solo lectura en el servidor, restaurando. - - + + Not allowed to remove, restoring No está permitido borrar, restaurando. - + Local files and share folder removed. Se eliminaron los archivos locales y la carpeta compartida. - + Move not allowed, item restored No está permitido mover, elemento restaurado. - + Move not allowed because %1 is read-only No está permitido mover, porque %1 es de sólo lectura. - + the destination destino - + the source origen @@ -2436,21 +2441,35 @@ No se recomienda usarla. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> <p>La versión %1. Para obtener más información, visite<a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> <p>Copyright ownCloud, incorporado</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> <p>Distribuido por %1 y con licencia GNU General Public License (GPL) Version 2.0.<br/>%2 y el lo de %2 son marcas registradas de %1 en los Estados Unidos y otros países, o ambos.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + La cabecera del archivo de comprobación es incorrecto. + + + + The downloaded file does not match the checksum, it will be resumed. + El archivo descargado no coincide con el archivo de comprobación, será reanudado. + + OCC::ownCloudGui @@ -2723,8 +2742,8 @@ No se recomienda usarla. Etiqueta de error - - + + TextLabel Texto de un etiqueta @@ -2844,27 +2863,27 @@ No se recomienda usarla. Utility - + %L1 TiB %L1 TiB - + %L1 GiB %L1 GiB - + %L1 MiB %L1 MiB - + %L1 KiB %L1 KiB - + %L1 B %L1 B @@ -2885,7 +2904,7 @@ No se recomienda usarla. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> <p><small>Construido desde la revisión Git <a href="%1">%2</a> en %3, %4 usando Qt %5, %6</small></p> diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts index 3ff0098c9..728d15d46 100644 --- a/translations/client_es_AR.ts +++ b/translations/client_es_AR.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time @@ -81,53 +81,53 @@ Conectado con <server> como <user> - + Add Folder... Agregar directorio... - + Pause Pausar - + Remove Borrar - + Choose What to Sync - + Storage Usage Uso del Almacenamiento - + Retrieving usage information... Obteniendo información del uso... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Nota:</b> Algunas carpetas, incluidas las montadas en red o las carpetas compartidas, pueden tener diferentes límites. - + Account Maintenance Mantenimiento de cuenta - + Edit Ignored Files Editar Archivos ignorados - + Modify Account Modificar Cuenta @@ -712,22 +712,22 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway - + We received a different E-Tag for resuming. Retrying next time. - + Server returned wrong content-range - + Connection Timeout @@ -1393,7 +1393,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout @@ -1401,7 +1401,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL @@ -1437,22 +1437,22 @@ It is not advisable to use it. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! - + The file could not be downloaded completely. - + File %1 cannot be saved because of a local file name clash! - + File has changed since discovery @@ -1580,38 +1580,43 @@ It is not advisable to use it. OCC::PropagateUploadFileQNAM - + File Removed - - + + Local file changed during syncing. It will be resumed. + + + + + Local file changed during sync. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. - + Poll URL missing - + The local file was removed during sync. - + The server did not acknowledge the last chunk. (No e-tag were present) @@ -2351,69 +2356,69 @@ It is not advisable to use it. - + Unable to initialize a sync journal. Imposible inicializar un diario de sincronización. - + Cannot open the sync journal - - + + Ignored because of the "choose what to sync" blacklist - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Local files and share folder removed. - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2429,21 +2434,35 @@ It is not advisable to use it. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + + + + + The downloaded file does not match the checksum, it will be resumed. + + + OCC::ownCloudGui @@ -2716,8 +2735,8 @@ It is not advisable to use it. Etiqueta de error - - + + TextLabel EtiquetaDeTexto @@ -2838,27 +2857,27 @@ It is not advisable to use it. Utility - + %L1 TiB - + %L1 GiB - + %L1 MiB - + %L1 KiB - + %L1 B %L1 B @@ -2879,7 +2898,7 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> diff --git a/translations/client_et.ts b/translations/client_et.ts index 1c5758040..1f8107ebe 100644 --- a/translations/client_et.ts +++ b/translations/client_et.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time @@ -81,53 +81,53 @@ Ühendatud <server> kasutajana <user> - + Add Folder... Lisa kaust... - + Pause Paus - + Remove Eemalda - + Choose What to Sync Vali, mida sünkroniseerida - + Storage Usage Kettakasutus - + Retrieving usage information... Otsin kasutuse informatsiooni... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Märkus:</b> Mõned kataloogid, sealhulgas võrgust ühendatud või jagatud kataloogid, võivad omada erinevaid limiite. - + Account Maintenance Konto hooldus - + Edit Ignored Files Redigeeri ignoreeritud faile - + Modify Account Muuda kontot @@ -713,22 +713,22 @@ Oled kindel, et soovid seda operatsiooni teostada? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Ühtegi E-Silti ei saabunud serverist, kontrolli puhverserverit/lüüsi. - + We received a different E-Tag for resuming. Retrying next time. Saime jätkamiseks erineva E-Sildi. Proovin järgmine kord uuesti. - + Server returned wrong content-range Server tagastas vale vahemiku - + Connection Timeout Ühenduse aegumine @@ -1395,7 +1395,7 @@ Selle kasutamine pole soovitatav. OCC::PUTFileJob - + Connection Timeout Ühenduse aegumine @@ -1403,7 +1403,7 @@ Selle kasutamine pole soovitatav. OCC::PollJob - + Invalid JSON reply from the poll URL @@ -1439,22 +1439,22 @@ Selle kasutamine pole soovitatav. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! Faili %1 ei saa alla laadida kuna on konflikt kohaliku faili nimega. - + The file could not be downloaded completely. - + File %1 cannot be saved because of a local file name clash! Faili %1 ei saa salvestada kuna on nime konflikt kohaliku failiga! - + File has changed since discovery @@ -1582,38 +1582,43 @@ Selle kasutamine pole soovitatav. OCC::PropagateUploadFileQNAM - + File Removed Fail eemaldatud - - + + Local file changed during syncing. It will be resumed. + + + + + Local file changed during sync. Kohalik fail muutus sünkroniseeringu käigus. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. Faili on lokaalselt muudetud, kuid see on osa kirjutamisõiguseta jagamisest. See on taastatud ning sinu muudatus on konfliktses failis. - + Poll URL missing - + The local file was removed during sync. Kohalik fail on eemaldatud sünkroniseeringu käigus. - + The server did not acknowledge the last chunk. (No e-tag were present) Server ei tunnistanud viimast tükki. (E-silt puudus). @@ -2355,69 +2360,69 @@ Selle kasutamine pole soovitatav. - + Unable to initialize a sync journal. Ei suuda lähtestada sünkroniseeringu zurnaali. - + Cannot open the sync journal Ei suuda avada sünkroniseeringu zurnaali - - + + Ignored because of the "choose what to sync" blacklist "Vali, mida sünkroniseerida" musta nimekirja tõttu vahele jäetud - + Not allowed because you don't have permission to add sub-directories in that directory Pole lubatud, kuna sul puuduvad õigused lisada sellesse kataloogi lisada alam-kataloogi - + Not allowed because you don't have permission to add parent directory Pole lubatud, kuna sul puuduvad õigused lisada ülemkataloog - + Not allowed because you don't have permission to add files in that directory Pole lubatud, kuna sul puuduvad õigused sellesse kataloogi faile lisada - + Not allowed to upload this file because it is read-only on the server, restoring Pole lubatud üles laadida, kuna tegemist on ainult-loetava serveriga, taastan - - + + Not allowed to remove, restoring Eemaldamine pole lubatud, taastan - + Local files and share folder removed. Kohalikud failid ja jagatud kaustad eemaldatud. - + Move not allowed, item restored Liigutamine pole lubatud, üksus taastatud - + Move not allowed because %1 is read-only Liigutamien pole võimalik kuna %1 on ainult lugemiseks - + the destination sihtkoht - + the source allikas @@ -2433,21 +2438,35 @@ Selle kasutamine pole soovitatav. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + + + + + The downloaded file does not match the checksum, it will be resumed. + + + OCC::ownCloudGui @@ -2720,8 +2739,8 @@ Selle kasutamine pole soovitatav. Vea silt - - + + TextLabel Tekstisilt @@ -2841,27 +2860,27 @@ Selle kasutamine pole soovitatav. Utility - + %L1 TiB %L1 TiB - + %L1 GiB %L1 GiB - + %L1 MiB %L1 MiB - + %L1 KiB %L1 KiB - + %L1 B %L1 B @@ -2882,7 +2901,7 @@ Selle kasutamine pole soovitatav. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> diff --git a/translations/client_eu.ts b/translations/client_eu.ts index c5d15d57f..8a5830055 100644 --- a/translations/client_eu.ts +++ b/translations/client_eu.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time @@ -81,53 +81,53 @@ <user> bezala <server>-n konektatuta - + Add Folder... Gehitu Karpeta... - + Pause Pausarazi - + Remove Ezabatu - + Choose What to Sync Hautatu zer sinkronizatu - + Storage Usage Biltegiratze Erabilera - + Retrieving usage information... Erabileraren informazioa eskuratzen... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Oharra:</b>Karpeta batzuk, sarekoa edo partekatutakoak, muga ezberdinak izan ditzazkete. - + Account Maintenance Kontuaren Mantenua - + Edit Ignored Files Editatu Baztertutako Fitxategiak - + Modify Account Aldatu Kontua @@ -713,22 +713,22 @@ Ziur zaude eragiketa hau egin nahi duzula? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Ez da E-Tagik jaso zerbitzaritik, egiaztatu Proxy/Gateway - + We received a different E-Tag for resuming. Retrying next time. Jarraitzeko E-Tag ezberdina jaso dugu. Hurrengoan saiatuko gara berriz. - + Server returned wrong content-range - + Connection Timeout Konexioa denboraz kanpo @@ -1395,7 +1395,7 @@ Ez da gomendagarria erabltzea. OCC::PUTFileJob - + Connection Timeout Konexioa denboraz kanpo @@ -1403,7 +1403,7 @@ Ez da gomendagarria erabltzea. OCC::PollJob - + Invalid JSON reply from the poll URL @@ -1439,22 +1439,22 @@ Ez da gomendagarria erabltzea. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! - + The file could not be downloaded completely. - + File %1 cannot be saved because of a local file name clash! - + File has changed since discovery @@ -1582,38 +1582,43 @@ Ez da gomendagarria erabltzea. OCC::PropagateUploadFileQNAM - + File Removed - - + + Local file changed during syncing. It will be resumed. + + + + + Local file changed during sync. Fitxategi lokala aldatu da sinkronizazioan. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. - + Poll URL missing - + The local file was removed during sync. Fitxategi lokala ezabatu da sinkronizazioan. - + The server did not acknowledge the last chunk. (No e-tag were present) @@ -2353,69 +2358,69 @@ Ez da gomendagarria erabltzea. - + Unable to initialize a sync journal. Ezin izan da sinkronizazio egunerokoa hasieratu. - + Cannot open the sync journal - - + + Ignored because of the "choose what to sync" blacklist - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring Ezabatzeko baimenik gabe, berrezartzen - + Local files and share folder removed. - + Move not allowed, item restored Mugitzea ez dago baimenduta, elementua berrezarri da - + Move not allowed because %1 is read-only Mugitzea ez dago baimenduta %1 irakurtzeko bakarrik delako - + the destination helburua - + the source jatorria @@ -2431,21 +2436,35 @@ Ez da gomendagarria erabltzea. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + + + + + The downloaded file does not match the checksum, it will be resumed. + + + OCC::ownCloudGui @@ -2718,8 +2737,8 @@ Ez da gomendagarria erabltzea. - - + + TextLabel TestuEtiketa @@ -2839,27 +2858,27 @@ Ez da gomendagarria erabltzea. Utility - + %L1 TiB - + %L1 GiB - + %L1 MiB - + %L1 KiB - + %L1 B %L1 B @@ -2880,7 +2899,7 @@ Ez da gomendagarria erabltzea. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> diff --git a/translations/client_fa.ts b/translations/client_fa.ts index 1bf9b7904..40e66acc0 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time @@ -81,53 +81,53 @@ - + Add Folder... افزودن پوشه... - + Pause توقف کردن - + Remove حذف - + Choose What to Sync - + Storage Usage - + Retrieving usage information... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. - + Account Maintenance - + Edit Ignored Files ویرایش فایل های در نظر گرفته نشده - + Modify Account ویرایش حساب کاربری @@ -712,22 +712,22 @@ Are you sure you want to perform this operation? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway - + We received a different E-Tag for resuming. Retrying next time. - + Server returned wrong content-range - + Connection Timeout تایم اوت اتصال @@ -1391,7 +1391,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout تایم اوت اتصال @@ -1399,7 +1399,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL @@ -1435,22 +1435,22 @@ It is not advisable to use it. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! - + The file could not be downloaded completely. - + File %1 cannot be saved because of a local file name clash! - + File has changed since discovery @@ -1578,38 +1578,43 @@ It is not advisable to use it. OCC::PropagateUploadFileQNAM - + File Removed - - + + Local file changed during syncing. It will be resumed. + + + + + Local file changed during sync. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. - + Poll URL missing - + The local file was removed during sync. - + The server did not acknowledge the last chunk. (No e-tag were present) @@ -2349,69 +2354,69 @@ It is not advisable to use it. - + Unable to initialize a sync journal. - + Cannot open the sync journal - - + + Ignored because of the "choose what to sync" blacklist - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Local files and share folder removed. - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2427,21 +2432,35 @@ It is not advisable to use it. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + + + + + The downloaded file does not match the checksum, it will be resumed. + + + OCC::ownCloudGui @@ -2714,8 +2733,8 @@ It is not advisable to use it. - - + + TextLabel برچسب متنی @@ -2835,27 +2854,27 @@ It is not advisable to use it. Utility - + %L1 TiB - + %L1 GiB - + %L1 MiB - + %L1 KiB - + %L1 B @@ -2876,7 +2895,7 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> diff --git a/translations/client_fi.ts b/translations/client_fi.ts index f6e52f278..b6c825a8d 100644 --- a/translations/client_fi.ts +++ b/translations/client_fi.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time @@ -81,53 +81,53 @@ Yhdistetty palvelimeen <server> käyttäen <user> tunnusta - + Add Folder... Lisää kansio... - + Pause Keskeytä - + Remove Poista - + Choose What to Sync Valitse synkronoitavat tiedot - + Storage Usage Tilan käyttö - + Retrieving usage information... Noudetaan käyttötietoja... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Huomio:</b> Jotkin kansiot, mukaan lukien verkon yli liitetyt tai jaetut kansiot, voivat olla eri rajoitusten piirissä. - + Account Maintenance Tilin ylläpito - + Edit Ignored Files Muokkaa sivuutettuja tiedostoja - + Modify Account Muokkaa tiliä @@ -711,22 +711,22 @@ Are you sure you want to perform this operation? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway - + We received a different E-Tag for resuming. Retrying next time. - + Server returned wrong content-range - + Connection Timeout Yhteys aikakatkaistiin @@ -1391,7 +1391,7 @@ Osoitteen käyttäminen ei ole suositeltavaa. OCC::PUTFileJob - + Connection Timeout Yhteys aikakatkaistiin @@ -1399,7 +1399,7 @@ Osoitteen käyttäminen ei ole suositeltavaa. OCC::PollJob - + Invalid JSON reply from the poll URL @@ -1435,22 +1435,22 @@ Osoitteen käyttäminen ei ole suositeltavaa. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! - + The file could not be downloaded completely. Tiedostoa ei voitu ladata täysin. - + File %1 cannot be saved because of a local file name clash! - + File has changed since discovery @@ -1578,38 +1578,43 @@ Osoitteen käyttäminen ei ole suositeltavaa. OCC::PropagateUploadFileQNAM - + File Removed Tiedosto poistettu - - + + Local file changed during syncing. It will be resumed. + + + + + Local file changed during sync. Paikallinen tiedosto muuttui synkronoinnin aikana. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. - + Poll URL missing - + The local file was removed during sync. Paikallinen tiedosto poistettiin synkronoinnin aikana. - + The server did not acknowledge the last chunk. (No e-tag were present) @@ -2351,69 +2356,69 @@ Osoitteen käyttäminen ei ole suositeltavaa. Tiedostonimen merkistökoodaus ei ole kelvollista - + Unable to initialize a sync journal. - + Cannot open the sync journal - - + + Ignored because of the "choose what to sync" blacklist - + Not allowed because you don't have permission to add sub-directories in that directory Ei sallittu, koska sinulla ei ole oikeutta lisätä alikansioita kyseiseen kansioon - + Not allowed because you don't have permission to add parent directory Ei sallittu, koska sinulla ei ole oikeutta lisätä ylätason kansiota - + Not allowed because you don't have permission to add files in that directory Ei sallittu, koska sinulla ei ole oikeutta lisätä tiedostoja kyseiseen kansioon - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring Poistaminen ei ole sallittua, palautetaan - + Local files and share folder removed. Paikalliset tiedostot ja jakokansio poistettu. - + Move not allowed, item restored Siirtäminen ei ole sallittua, kohde palautettu - + Move not allowed because %1 is read-only Siirto ei ole sallittu, koska %1 on "vain luku"-tilassa - + the destination kohde - + the source lähde @@ -2429,21 +2434,35 @@ Osoitteen käyttäminen ei ole suositeltavaa. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> <p>Versio %1. Lisätietoja osoitteessa <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> <p>Tekijänoikeus ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + + + + + The downloaded file does not match the checksum, it will be resumed. + + + OCC::ownCloudGui @@ -2716,8 +2735,8 @@ Osoitteen käyttäminen ei ole suositeltavaa. - - + + TextLabel TekstiLeima @@ -2837,27 +2856,27 @@ Osoitteen käyttäminen ei ole suositeltavaa. Utility - + %L1 TiB - + %L1 GiB - + %L1 MiB - + %L1 KiB - + %L1 B %L1 t @@ -2878,7 +2897,7 @@ Osoitteen käyttäminen ei ole suositeltavaa. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 8c4cdd40b..cd4acd19c 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time Le fichier de destination a une erreur de taille ou de date de modification @@ -81,53 +81,53 @@ Connecté à <server> en tant que <user> - + Add Folder... Ajouter un dossier... - + Pause Pause - + Remove Supprimer - + Choose What to Sync Choisir le contenu à synchroniser - + Storage Usage Utilisation du stockage - + Retrieving usage information... Récupération des informations d'utilisation... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Note :</b> Certains dossiers, montés depuis le réseau ou partagés, peuvent avoir des limites différentes. - + Account Maintenance Maintenance du compte - + Edit Ignored Files Modifier les fichiers ignorés - + Modify Account Modifier le compte @@ -713,22 +713,22 @@ Voulez-vous réellement effectuer cette opération ? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Aucun E-Tag reçu du serveur, vérifiez le proxy / la passerelle - + We received a different E-Tag for resuming. Retrying next time. Nous avons reçu un E-Tag différent pour reprendre le téléchargement. Nouvel essai la prochaine fois. - + Server returned wrong content-range Le serveur a retourné une gamme de contenu erronée - + Connection Timeout Délai d'attente de connexion dépassé @@ -849,7 +849,7 @@ Les motifs cochés seront également supprimés s'ils empêchent la suppres Edit ignore pattern: - Éditer le motif : + Modifier le motif : @@ -1145,7 +1145,7 @@ L'assistant peut demander des privilèges additionnels durant le processus. <p><small><strong>Warning:</strong> You currently have multiple folders configured. If you continue with the current settings, the folder configurations will be discarded and a single root folder sync will be created!</small></p> - <p><small><strong>Attention :</strong> Vous avez plusieurs dossiers configurés. Si vous continuez avec les nouveaux paramètres, les configuration de dossiers actuelles seront perdues et une synchronisation de la racine de votre compte vers un seul dossier sera mise en place !</small></p> + <p><small><strong>Attention :</strong> Vous avez plusieurs dossiers configurés. Si vous continuez avec les paramètres actuels, les configurations de dossiers seront perdues et une synchronisation de la racine de votre compte vers un seul dossier sera mise en place !</small></p> @@ -1396,7 +1396,7 @@ Il est déconseillé de l'utiliser. OCC::PUTFileJob - + Connection Timeout Délai d'attente de connexion dépassé @@ -1404,7 +1404,7 @@ Il est déconseillé de l'utiliser. OCC::PollJob - + Invalid JSON reply from the poll URL L'URL interrogéé a renvoyé une réponse json non valide @@ -1440,22 +1440,22 @@ Il est déconseillé de l'utiliser. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! Le fichier %1 ne peut pas être téléchargé en raison d'un conflit sur le nom de fichier local. - + The file could not be downloaded completely. Le fichier n'a pas pu être téléchargé intégralement. - + File %1 cannot be saved because of a local file name clash! Le fichier %1 n'a pas pu être sauvegardé en raison d'un conflit sur le nom du fichier local ! - + File has changed since discovery Le fichier a changé depuis sa découverte @@ -1583,38 +1583,43 @@ Il est déconseillé de l'utiliser. OCC::PropagateUploadFileQNAM - + File Removed Fichier supprimé - - + + Local file changed during syncing. It will be resumed. + Fichier local modifié pendant la synchronisation. Elle va reprendre. + + + + Local file changed during sync. Fichier local modifié pendant la synchronisation. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. Le fichier a été modifié localement mais appartient à un partage en lecture seule. Il a été restauré et vos modifications sont présentes dans le fichiers de conflit. - + Poll URL missing URL de sondage manquante - + The local file was removed during sync. Fichier local supprimé pendant la synchronisation. - + The server did not acknowledge the last chunk. (No e-tag were present) Le serveur n'a pas acquitté le dernier morceau (aucun e-tag n'était présent). @@ -1684,7 +1689,7 @@ Il est déconseillé de l'utiliser. Currently no files are ignored because of previous errors and no downloads are in progress. - Actuellement aucun fichier n'a été ignoré en raison d'erreurs précédentes, et aucun téléchargement n'est en cours. + Actuellement, aucun fichier n'a été ignoré en raison des erreurs précédentes et aucun téléchargement n'est en cours. @@ -2362,69 +2367,69 @@ Il est déconseillé de l'utiliser. L'encodage du nom de fichier n'est pas valide - + Unable to initialize a sync journal. Impossible d'initialiser un journal de synchronisation. - + Cannot open the sync journal Impossible d'ouvrir le journal de synchronisation - - + + Ignored because of the "choose what to sync" blacklist Ignoré à cause de la liste noire "Choisir le contenu à synchroniser". - + Not allowed because you don't have permission to add sub-directories in that directory Non autorisé car vous n'avez pas la permission d'ajouter des sous-dossiers dans ce dossier - + Not allowed because you don't have permission to add parent directory Non autorisé car vous n'avez pas la permission d'ajouter des dossiers parents - + Not allowed because you don't have permission to add files in that directory Non autorisé car vous n'avez pas la permission d'ajouter des fichiers dans ce dossier - + Not allowed to upload this file because it is read-only on the server, restoring Non autorisé à envoyer ce fichier car il est en lecture seule sur le serveur. Restauration - - + + Not allowed to remove, restoring Non autorisé à supprimer. Restauration - + Local files and share folder removed. Fichiers locaux et répertoire de partage supprimés. - + Move not allowed, item restored Déplacement non autorisé, élément restauré - + Move not allowed because %1 is read-only Déplacement non autorisé car %1 est en mode lecture seule - + the destination la destination - + the source la source @@ -2440,21 +2445,35 @@ Il est déconseillé de l'utiliser. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> <p>Version %1. Pour plus d'information, visitez <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> <p>Copyright ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> <p>Distribué par %1 et sous licence GNU General Public License (GPL) Version 2.0.<br/>%2 et le logo %2 sont des marques enregistrées de %1 aux Etats-Unis, dans d'autres pays, ou les deux.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + L'entête de somme de contrôle est mal formée. + + + + The downloaded file does not match the checksum, it will be resumed. + Le fichier téléchargé ne correspond pas avec la somme de contrôle, il va être téléchargé à nouveau. + + OCC::ownCloudGui @@ -2727,8 +2746,8 @@ Il est déconseillé de l'utiliser. Message d'erreur - - + + TextLabel Zone de texte @@ -2848,27 +2867,27 @@ Il est déconseillé de l'utiliser. Utility - + %L1 TiB %L1 Tio - + %L1 GiB %L1 Gio - + %L1 MiB %L1 Mio - + %L1 KiB %L1 Kio - + %L1 B %L1 octets @@ -2889,7 +2908,7 @@ Il est déconseillé de l'utiliser. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> <p><small>Construit à partir de la révision Git <a href="%1">%2</a> du %3, %4 en utilisant Qt %5, %6.</small><p> diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 12a456b71..d5598bc18 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time O ficheiro de destino ten un tamaño ou unha hora de modificación non agardados @@ -81,53 +81,53 @@ Conectado con <server> como <user> - + Add Folder... Engadir un cartafol... - + Pause Pausa - + Remove Retirar - + Choose What to Sync Escolla que sincronizar - + Storage Usage Uso do almacenamento - + Retrieving usage information... Recuperando a información de uso... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Nota:</b> Algúns cartafoles, como os cartafoles de rede montados ou os compartidos, poden ten diferentes límites. - + Account Maintenance Mantemento da conta - + Edit Ignored Files Editar os ficheiros ignorados - + Modify Account Modificar a conta @@ -713,22 +713,22 @@ Confirma que quere realizar esta operación? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Non se recibiu a «E-Tag» do servidor, comprobe o proxy e/ou a pasarela - + We received a different E-Tag for resuming. Retrying next time. Recibiuse unha «E-Tag» diferente para continuar. Tentándoo outra vez. - + Server returned wrong content-range O servidor devolveu un intervalo de contidos estragado - + Connection Timeout Esgotouse o tempo de conexión @@ -1396,7 +1396,7 @@ Recomendámoslle que non o use. OCC::PUTFileJob - + Connection Timeout Esgotouse o tempo de conexión @@ -1404,7 +1404,7 @@ Recomendámoslle que non o use. OCC::PollJob - + Invalid JSON reply from the poll URL O URL requirido devolveu unha resposta JSON incorrecta @@ -1440,22 +1440,22 @@ Recomendámoslle que non o use. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! Non é posíbel descargar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local! - + The file could not be downloaded completely. Non foi posíbel descargar completamente o ficheiro. - + File %1 cannot be saved because of a local file name clash! Non foi posíbel gardar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local! - + File has changed since discovery O ficheiro cambiou após seren atopado @@ -1583,38 +1583,43 @@ Recomendámoslle que non o use. OCC::PropagateUploadFileQNAM - + File Removed Ficheiro retirado - - + + Local file changed during syncing. It will be resumed. + O ficheiro local cambiou durante a sincronización. Retomase. + + + + Local file changed during sync. O ficheiro local cambiou durante a sincronización. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. Forzando a interrupción do traballo na conexión HTTP reiniciandoa con Qt <5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. O ficheiro foi editado localmente mais é parte dunha compartición de só lectura. O ficheiro foi restaurado e a súa edición atopase no ficheiro de conflitos. - + Poll URL missing Non se atopa o URL requirido - + The local file was removed during sync. O ficheiro local retirarase durante a sincronización. - + The server did not acknowledge the last chunk. (No e-tag were present) O servidor non recoñeceu o último fragmento. (Non hai e-tag presente) @@ -2359,69 +2364,69 @@ Recomendámoslle que non o use. O nome de ficheiro codificado non é correcto - + Unable to initialize a sync journal. Non é posíbel preparar un rexistro de sincronización. - + Cannot open the sync journal Non foi posíbel abrir o rexistro de sincronización - - + + Ignored because of the "choose what to sync" blacklist Ignorado por mor da lista negra de «escolla que sincronizar» - + Not allowed because you don't have permission to add sub-directories in that directory Non está permitido xa que non ten permiso para engadir subdirectorios nese directorio - + Not allowed because you don't have permission to add parent directory Non está permitido xa que non ten permiso para engadir un directorio pai - + Not allowed because you don't have permission to add files in that directory Non está permitido xa que non ten permiso para engadir ficheiros nese directorio - + Not allowed to upload this file because it is read-only on the server, restoring Non está permitido o envío xa que o ficheiro é só de lectura no servidor, restaurando - - + + Not allowed to remove, restoring Non está permitido retiralo, restaurando - + Local files and share folder removed. Retirados os ficheiros locais e o cartafol compartido. - + Move not allowed, item restored Nos está permitido movelo, elemento restaurado - + Move not allowed because %1 is read-only Bon está permitido movelo xa que %1 é só de lectura - + the destination o destino - + the source a orixe @@ -2437,21 +2442,35 @@ Recomendámoslle que non o use. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> <p>Versión %1. Para obter máis información visite <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> <p>Copyright ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> <p>Distribuído por %1 e licenciado baixo a Licenza Pública Xeral (GPL) GNU Versión 2.0.<br/>Os logotipos %2 e %2 son marcas rexistradas de %1 nos Estados Unidos de Norte América e/ou outros países.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + A cabeceira da suma de comprobación é incorrecta. + + + + The downloaded file does not match the checksum, it will be resumed. + O ficheiro descargado non coincide coa suma de comprobación. Retomase. + + OCC::ownCloudGui @@ -2724,8 +2743,8 @@ Recomendámoslle que non o use. Etiqueta de erro - - + + TextLabel Etiqueta de texto @@ -2845,27 +2864,27 @@ Recomendámoslle que non o use. Utility - + %L1 TiB %L1 TiB - + %L1 GiB %L1 GiB - + %L1 MiB %L1 MiB - + %L1 KiB %L1 KiB - + %L1 B %L1 B @@ -2886,7 +2905,7 @@ Recomendámoslle que non o use. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> <p><small>Construído a partir de la revisión Git <a href="%1">%2</a> en %3, %4 usando Qt %5, %6</small></p> diff --git a/translations/client_hu.ts b/translations/client_hu.ts index 26988308c..0ea5f235c 100644 --- a/translations/client_hu.ts +++ b/translations/client_hu.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time @@ -81,53 +81,53 @@ - + Add Folder... Mappa lètrehozása... - + Pause Szünet - + Remove Eltávolítás - + Choose What to Sync Szinkronizálandó elemek kiválasztása - + Storage Usage Tárhelyhasználat - + Retrieving usage information... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. - + Account Maintenance Fiókkarbantartás - + Edit Ignored Files Kihagyott fájlok szerkesztése - + Modify Account Fiók módosítása @@ -710,22 +710,22 @@ Are you sure you want to perform this operation? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway - + We received a different E-Tag for resuming. Retrying next time. - + Server returned wrong content-range - + Connection Timeout @@ -1389,7 +1389,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout @@ -1397,7 +1397,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL @@ -1433,22 +1433,22 @@ It is not advisable to use it. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! - + The file could not be downloaded completely. - + File %1 cannot be saved because of a local file name clash! - + File has changed since discovery @@ -1576,38 +1576,43 @@ It is not advisable to use it. OCC::PropagateUploadFileQNAM - + File Removed - - + + Local file changed during syncing. It will be resumed. + + + + + Local file changed during sync. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. - + Poll URL missing - + The local file was removed during sync. - + The server did not acknowledge the last chunk. (No e-tag were present) @@ -2347,69 +2352,69 @@ It is not advisable to use it. - + Unable to initialize a sync journal. - + Cannot open the sync journal - - + + Ignored because of the "choose what to sync" blacklist - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Local files and share folder removed. - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2425,21 +2430,35 @@ It is not advisable to use it. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + + + + + The downloaded file does not match the checksum, it will be resumed. + + + OCC::ownCloudGui @@ -2712,8 +2731,8 @@ It is not advisable to use it. - - + + TextLabel TextLabel @@ -2833,27 +2852,27 @@ It is not advisable to use it. Utility - + %L1 TiB - + %L1 GiB - + %L1 MiB - + %L1 KiB - + %L1 B %L1 B @@ -2874,7 +2893,7 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> diff --git a/translations/client_it.ts b/translations/client_it.ts index b0d8d1624..a2a1c30d3 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time Il file di destinazione ha una dimensione o un'ora di modifica inattesa @@ -81,53 +81,53 @@ Connesso a <server> come <user> - + Add Folder... Aggiungi cartella... - + Pause Pausa - + Remove Rimuovi - + Choose What to Sync Scegli cosa sincronizzare - + Storage Usage Utilizzo archiviazione - + Retrieving usage information... Recupero delle informazioni di utilizzo in corso... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Nota:</b> alcune cartelle, incluse le cartelle montate o condivise in rete, potrebbero avere limiti diversi. - + Account Maintenance Gestione account - + Edit Ignored Files Modifica file ignorati - + Modify Account Modifica account @@ -713,22 +713,22 @@ Sei sicuro di voler eseguire questa operazione? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Nessun e-tag ricevuto dal server, controlla il proxy/gateway - + We received a different E-Tag for resuming. Retrying next time. Abbiamo ricevuto un e-tag diverso per il recupero. Riprova più tardi. - + Server returned wrong content-range Il server ha restituito un content-range errato - + Connection Timeout Connessione scaduta @@ -1395,7 +1395,7 @@ Non è consigliabile utilizzarlo. OCC::PUTFileJob - + Connection Timeout Connessione scaduta @@ -1403,7 +1403,7 @@ Non è consigliabile utilizzarlo. OCC::PollJob - + Invalid JSON reply from the poll URL Risposta JSON non valida dall'URL di richiesta @@ -1439,22 +1439,22 @@ Non è consigliabile utilizzarlo. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! Il file %1 non può essere scaricato a causa di un conflitto con un file locale. - + The file could not be downloaded completely. Il file non può essere scaricato completamente. - + File %1 cannot be saved because of a local file name clash! Il file %1 non può essere salvato a causa di un conflitto con un file locale. - + File has changed since discovery Il file è stato modificato dal suo rilevamento @@ -1582,38 +1582,43 @@ Non è consigliabile utilizzarlo. OCC::PropagateUploadFileQNAM - + File Removed File rimosso - - + + Local file changed during syncing. It will be resumed. + Il file locale è stato modificato durante la sincronizzazione. Sarà ripristinato. + + + + Local file changed during sync. Un file locale è cambiato durante la sincronizzazione. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. Forzare l'interruzione dell'operazione in caso di ripristino della connessione HTTP con Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. Il file è stato modificato localmente, ma è parte di una condivisione in sola lettura. È stato ripristinato e la tua modifica è nel file di conflitto. - + Poll URL missing URL di richiesta mancante - + The local file was removed during sync. Il file locale è stato rimosso durante la sincronizzazione. - + The server did not acknowledge the last chunk. (No e-tag were present) Il server non ha riconosciuto l'ultimo pezzo. (Non era presente alcun e-tag) @@ -2359,69 +2364,69 @@ Non è consigliabile utilizzarlo. La codifica del nome del file non è valida - + Unable to initialize a sync journal. Impossibile inizializzare il registro di sincronizzazione. - + Cannot open the sync journal Impossibile aprire il registro di sincronizzazione - - + + Ignored because of the "choose what to sync" blacklist Ignorato in base alla lista nera per la scelta di cosa sincronizzare - + Not allowed because you don't have permission to add sub-directories in that directory Non consentito poiché non disponi dei permessi per aggiungere sottocartelle in quella cartella - + Not allowed because you don't have permission to add parent directory Non consentito poiché non disponi dei permessi per aggiungere la cartella superiore - + Not allowed because you don't have permission to add files in that directory Non consentito poiché non disponi dei permessi per aggiungere file in quella cartella - + Not allowed to upload this file because it is read-only on the server, restoring Il caricamento di questo file non è consentito poiché è in sola lettura sul server, ripristino - - + + Not allowed to remove, restoring Rimozione non consentita, ripristino - + Local files and share folder removed. I file locali e la cartella condivisa sono stati rimossi. - + Move not allowed, item restored Spostamento non consentito, elemento ripristinato - + Move not allowed because %1 is read-only Spostamento non consentito poiché %1 è in sola lettura - + the destination la destinazione - + the source l'origine @@ -2437,21 +2442,35 @@ Non è consigliabile utilizzarlo. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> <p>Versione %1. Per ulteriori informazioni vedi <a href="%2">3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> <p>Copyright ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> <p>Distribuito da %1 e sotto licenza GNU General Public License (GPL) versione 2.0.<br/>%2 e il logo di %2 sono marchi registrati di %1 negli Stati Uniti, in altri paesi o entrambi.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + L'intestazione del codice di controllo è malformata. + + + + The downloaded file does not match the checksum, it will be resumed. + Il file scaricato non verifica il codice di controllo, sarà ripristinato. + + OCC::ownCloudGui @@ -2724,8 +2743,8 @@ Non è consigliabile utilizzarlo. Etichetta di errore - - + + TextLabel EtichettaTesto @@ -2845,27 +2864,27 @@ Non è consigliabile utilizzarlo. Utility - + %L1 TiB %L1 TiB - + %L1 GiB %L1 GiB - + %L1 MiB %L1 MiB - + %L1 KiB %L1 KiB - + %L1 B %L1 B @@ -2886,7 +2905,7 @@ Non è consigliabile utilizzarlo. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> <p><small>Compilato dalla revisione Git <a href="%1">%2</a> il %3, %4 utilizzando Qt %5, %6</small><p> diff --git a/translations/client_ja.ts b/translations/client_ja.ts index 2b163b7cf..782b0b444 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time @@ -81,53 +81,53 @@ <server> に <user> で接続中 - + Add Folder... フォルダーを追加… - + Pause 一時停止 - + Remove 削除 - + Choose What to Sync 同期フォルダーを選択 - + Storage Usage ストレージ利用状況 - + Retrieving usage information... 利用状況を取得中... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>注:</b> 外部ネットワークストレージや共有フォルダーを含むフォルダーがある場合は、容量の上限値が異なる可能性があります。 - + Account Maintenance アカウントの管理 - + Edit Ignored Files 除外ファイルリストを編集 - + Modify Account アカウントを修正 @@ -713,22 +713,22 @@ Are you sure you want to perform this operation? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway サーバーからE-Tagを受信できません。プロキシ/ゲートウェイを確認してください。 - + We received a different E-Tag for resuming. Retrying next time. 同期再開時に違う E-Tagを受信しました。次回リトライします。 - + Server returned wrong content-range サーバーが間違ったcontent-rangeを返しました - + Connection Timeout 接続タイムアウト @@ -1394,7 +1394,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout 接続タイムアウト @@ -1402,7 +1402,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL 不正なJSONがポーリングURLから返りました @@ -1438,22 +1438,22 @@ It is not advisable to use it. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! ファイル %1 はローカルファイル名が衝突しているためダウンロードできません！ - + The file could not be downloaded completely. このファイルのダウンロードは完了しませんでした - + File %1 cannot be saved because of a local file name clash! %1 はローカルファイル名が衝突しているため保存できません！ - + File has changed since discovery @@ -1581,38 +1581,43 @@ It is not advisable to use it. OCC::PropagateUploadFileQNAM - + File Removed ファイルを削除しました - - + + Local file changed during syncing. It will be resumed. + + + + + Local file changed during sync. ローカルのファイルが同期中に変更されました。 - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. ファイルがローカルで編集されましたが、読み込み専用の共有の一部です。ファイルは復元され、あなたの編集は競合するファイル内にあります。 - + Poll URL missing ポーリングURLがありません - + The local file was removed during sync. ローカルファイルを同期中に削除します。 - + The server did not acknowledge the last chunk. (No e-tag were present) サーバーは最終チャンクを認識しません。(e-tag が存在しません) @@ -2356,69 +2361,69 @@ It is not advisable to use it. ファイル名のエンコーディングが無効です。 - + Unable to initialize a sync journal. 同期ジャーナルの初期化ができません。 - + Cannot open the sync journal 同期ジャーナルを開くことができません - - + + Ignored because of the "choose what to sync" blacklist "同期対象先" ブラックリストにより無視されました。 - + Not allowed because you don't have permission to add sub-directories in that directory そのディレクトリにサブディレクトリを追加する権限がありません - + Not allowed because you don't have permission to add parent directory 親ディレクトリを追加する権限がありません - + Not allowed because you don't have permission to add files in that directory そのディレクトリにファイルを追加する権限がありません - + Not allowed to upload this file because it is read-only on the server, restoring サーバーでは読み取り専用となっているため、このファイルをアップロードすることはできません、復元しています - - + + Not allowed to remove, restoring 削除できないので復元しています - + Local files and share folder removed. ローカルファイルと共有フォルダーを削除しました。 - + Move not allowed, item restored 移動できないので項目を復元しました - + Move not allowed because %1 is read-only %1 は読み取り専用のため移動できません - + the destination 移動先 - + the source 移動元 @@ -2434,21 +2439,35 @@ It is not advisable to use it. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> <p>バージョン %1. 詳細な情報は<a href='%2'>%3</a>を確認してください。</p> - + <p>Copyright ownCloud, Incorporated</p> <p>Copyright ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> <p>%1 が配布し、 GNU General Public License (GPL) バージョン2.0 の下でライセンスされています。<br/>%2 及び %2 のロゴはアメリカ合衆国またはその他の国、あるいはその両方における %1 の登録商標です。</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + + + + + The downloaded file does not match the checksum, it will be resumed. + + + OCC::ownCloudGui @@ -2721,8 +2740,8 @@ It is not advisable to use it. エラーラベル - - + + TextLabel テキストラベル @@ -2842,27 +2861,27 @@ It is not advisable to use it. Utility - + %L1 TiB %L1 TiB - + %L1 GiB %L1 GiB - + %L1 MiB %L1 MiB - + %L1 KiB %L1 KiB - + %L1 B %L1 B @@ -2883,7 +2902,7 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> diff --git a/translations/client_nl.ts b/translations/client_nl.ts index 3fa3d280c..45909d89c 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time Het doelbestand heeft een onverwachte omvang of tijdstempel @@ -81,53 +81,53 @@ Verbonden met <server> als <user> - + Add Folder... Map toevoegen... - + Pause Pauze - + Remove Verwijder - + Choose What to Sync Wat synchroniseren - + Storage Usage Gebruik opslagruimte - + Retrieving usage information... Gebruiksinformatie wordt opgehaald ... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Opmerking:</b> Sommige mappen, waaronder netwerkmappen en gedeelde mappen, kunnen andere limieten hebben. - + Account Maintenance Accountonderhoud - + Edit Ignored Files Bewerk genegeerde bestanden - + Modify Account Aanpassen account @@ -713,22 +713,22 @@ Weet u zeker dat u deze bewerking wilt uitvoeren? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Geen E-Tag ontvangen van de server, controleer Proxy/Gateway - + We received a different E-Tag for resuming. Retrying next time. We ontvingen een afwijkende E-Tag om door te gaan. We proberen het later opnieuw. - + Server returned wrong content-range Server retourneerde verkeerde content-bandbreedte - + Connection Timeout Verbindingstime-out @@ -1396,7 +1396,7 @@ We adviseren deze site niet te gebruiken. OCC::PUTFileJob - + Connection Timeout Verbindingstime-out @@ -1404,7 +1404,7 @@ We adviseren deze site niet te gebruiken. OCC::PollJob - + Invalid JSON reply from the poll URL Ongeldig JSON antwoord van de peilingen URL @@ -1440,22 +1440,22 @@ We adviseren deze site niet te gebruiken. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! Bestand %1 kan niet worden gedownload omdat de naam conflicteert met een lokaal bestand - + The file could not be downloaded completely. Het bestand kon niet volledig worden gedownload. - + File %1 cannot be saved because of a local file name clash! Bestand %1 kan niet worden opgeslagen wegens een lokaal bestandsnaam conflict! - + File has changed since discovery Het bestand is gewijzigd sinds het is gevonden @@ -1583,38 +1583,43 @@ We adviseren deze site niet te gebruiken. OCC::PropagateUploadFileQNAM - + File Removed Bestand verwijderd - - + + Local file changed during syncing. It will be resumed. + Lokaal bestand gewijzigd bij sync. Wordt opnieuw meengenomen. + + + + Local file changed during sync. Lokaal bestand gewijzigd bij sync. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. Forceren job-beëindiging op HTTP verbindingsreset met Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. Het bestand is lokaal bewerkt, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet en uw bewerking staat in het conflicten bestand. - + Poll URL missing URL peiling ontbreekt - + The local file was removed during sync. Het lokale bestand werd verwijderd tijdens sync. - + The server did not acknowledge the last chunk. (No e-tag were present) De server heeft het laatste deel niet bevestigd (er was geen e-tag aanwezig) @@ -2360,69 +2365,69 @@ We adviseren deze site niet te gebruiken. Bestandsnaamcodering is niet geldig - + Unable to initialize a sync journal. Niet in staat om een synchronisatie transactielog te starten. - + Cannot open the sync journal Kan het sync transactielog niet openen - - + + Ignored because of the "choose what to sync" blacklist Genegeerd vanwege de "wat synchroniseren" zwarte lijst - + Not allowed because you don't have permission to add sub-directories in that directory Niet toegestaan, omdat u geen rechten hebt om sub-directories aan te maken in die directory - + Not allowed because you don't have permission to add parent directory Niet toegestaan, omdat u geen rechten hebt om een bovenliggende directories toe te voegen - + Not allowed because you don't have permission to add files in that directory Niet toegestaan, omdat u geen rechten hebt om bestanden in die directory toe te voegen - + Not allowed to upload this file because it is read-only on the server, restoring Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen - - + + Not allowed to remove, restoring Niet toegestaan om te verwijderen, herstellen - + Local files and share folder removed. Lokale bestanden en share-map verwijderd. - + Move not allowed, item restored Verplaatsen niet toegestaan, object hersteld - + Move not allowed because %1 is read-only Verplaatsen niet toegestaan omdat %1 alleen-lezen is - + the destination bestemming - + the source bron @@ -2438,21 +2443,35 @@ We adviseren deze site niet te gebruiken. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> <p>Versie %1. Voor meer informatie bezoek <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> <p>Copyright ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> <p>Gedistribueer door %1 en gelicenseerd onder de GNU General Public License (GPL) Versie 2.0.<br/>%2 en het %2 logo zijn geregistreerde handelsmerken van %1 in de Verenigde Staten, in andere landen of beide.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + De kop van het controlegetal is misvormd. + + + + The downloaded file does not match the checksum, it will be resumed. + Het gedownloade bestand komt niet overeen met het controlegetal. Het wordt opnieuw verwerkt. + + OCC::ownCloudGui @@ -2725,8 +2744,8 @@ We adviseren deze site niet te gebruiken. Foutlabel - - + + TextLabel Tekstlabel @@ -2846,27 +2865,27 @@ We adviseren deze site niet te gebruiken. Utility - + %L1 TiB %L1 TiB - + %L1 GiB %L1 GiB - + %L1 MiB %L1 MiB - + %L1 KiB %L1 KiB - + %L1 B %L1 B @@ -2887,7 +2906,7 @@ We adviseren deze site niet te gebruiken. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> <p><small>Gebouwd van Git revisie <a href="%1">%2</a> op %3, %4 gebruik makend van Qt %5, %6</small></p> @@ -2907,7 +2926,7 @@ We adviseren deze site niet te gebruiken. Downloaded, renamed conflicting file - Gedownloaded, conflicterend bestand hernoemd + Gedownload, conflicterend bestand hernoemd diff --git a/translations/client_pl.ts b/translations/client_pl.ts index 51607a99d..023becaf3 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time @@ -81,53 +81,53 @@ Połączony z <server> jako <user> - + Add Folder... Dodaj katalog... - + Pause Wstrzymaj - + Remove Usuń - + Choose What to Sync Wybierz co synchronizować - + Storage Usage Użycie zasobów - + Retrieving usage information... Pobieranie informacji o użyciu - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Uwaga:</b> Niektóre foldery, włączając podłączone w sieci lub współdzielone mogą mieć różne limity. - + Account Maintenance Utrzymanie Konta. - + Edit Ignored Files Edytuj pliki ignorowane - + Modify Account Zmień Konto @@ -713,22 +713,22 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Nie otrzymano E-Tag z serwera, sprawdź Proxy/Bramę - + We received a different E-Tag for resuming. Retrying next time. Otrzymaliśmy inny E-Tag wznowienia. Spróbuje ponownie następnym razem. - + Server returned wrong content-range Serwer zwrócił błędną zakres zawartości - + Connection Timeout Limit czasu połączenia @@ -1395,7 +1395,7 @@ Niezalecane jest jego użycie. OCC::PUTFileJob - + Connection Timeout Limit czasu połączenia @@ -1403,7 +1403,7 @@ Niezalecane jest jego użycie. OCC::PollJob - + Invalid JSON reply from the poll URL @@ -1439,22 +1439,22 @@ Niezalecane jest jego użycie. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! Nie można pobrać pliku %1 ze względu na konflikt nazwy pliku lokalnego! - + The file could not be downloaded completely. - + File %1 cannot be saved because of a local file name clash! - + File has changed since discovery @@ -1582,38 +1582,43 @@ Niezalecane jest jego użycie. OCC::PropagateUploadFileQNAM - + File Removed Usunięto plik - - + + Local file changed during syncing. It will be resumed. + + + + + Local file changed during sync. Lokalny plik zmienił się podczas synchronizacji. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Został przywrócony i Twoja edycja jest w pliku konfliktu - + Poll URL missing - + The local file was removed during sync. Pliki lokalny został usunięty podczas synchronizacji. - + The server did not acknowledge the last chunk. (No e-tag were present) Serwer nie potwierdził ostatniego łańcucha danych. (Nie było żadnego e-tag-u) @@ -2355,69 +2360,69 @@ Niezalecane jest jego użycie. - + Unable to initialize a sync journal. Nie można zainicjować synchronizacji dziennika. - + Cannot open the sync journal Nie można otworzyć dziennika synchronizacji - - + + Ignored because of the "choose what to sync" blacklist - + Not allowed because you don't have permission to add sub-directories in that directory Nie masz uprawnień do dodawania podkatalogów w tym katalogu. - + Not allowed because you don't have permission to add parent directory Nie masz uprawnień by dodać katalog nadrzędny - + Not allowed because you don't have permission to add files in that directory Nie masz uprawnień by dodać pliki w tym katalogu - + Not allowed to upload this file because it is read-only on the server, restoring Wgrywanie niedozwolone, ponieważ plik jest tylko do odczytu na serwerze, przywracanie - - + + Not allowed to remove, restoring Brak uprawnień by usunąć, przywracanie - + Local files and share folder removed. - + Move not allowed, item restored Przenoszenie niedozwolone, obiekt przywrócony - + Move not allowed because %1 is read-only Przenoszenie niedozwolone, ponieważ %1 jest tylko do odczytu - + the destination docelowy - + the source źródło @@ -2433,21 +2438,35 @@ Niezalecane jest jego użycie. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + + + + + The downloaded file does not match the checksum, it will be resumed. + + + OCC::ownCloudGui @@ -2720,8 +2739,8 @@ Niezalecane jest jego użycie. Etykieta błędu - - + + TextLabel Etykieta @@ -2842,27 +2861,27 @@ Kliknij Utility - + %L1 TiB %L1 TiB - + %L1 GiB %L1 GiB - + %L1 MiB %L1 MiB - + %L1 KiB %L1 KiB - + %L1 B %L1 B @@ -2883,7 +2902,7 @@ Kliknij ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> diff --git a/translations/client_pt.ts b/translations/client_pt.ts index fde15afa2..7f0493556 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -2,9 +2,9 @@ FileSystem - + The destination file has an unexpected size or modification time - + O ficheiro destino tem um tamanho ou hora de modificação inesperado @@ -81,53 +81,53 @@ Conetado com <server> como <user> - + Add Folder... Adicionar Pasta ... - + Pause Pausar - + Remove Remover - + Choose What to Sync Escolher o Que Sincronizar - + Storage Usage Utilização do Armazenamento - + Retrieving usage information... A obter estatísticas da utilização ... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Nota:</b> Algumas pastas, incluindo pastas partilhadas ou montadas na rede, podem ter limites diferentes. - + Account Maintenance Manutenção da Conta - + Edit Ignored Files Editar Ficheiros Ignorados - + Modify Account Modificar Conta @@ -660,7 +660,7 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q Authentication failed accessing %1 - + A autenticação falhou ao acessar %1 @@ -712,22 +712,22 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Nenhum E-Tag recebido do servidor, verifique Proxy / gateway - + We received a different E-Tag for resuming. Retrying next time. Recebemos um e-Tag diferente para resumir. Tentando uma próxima vez. - + Server returned wrong content-range O servidor retornou o alcance-conteúdo errado - + Connection Timeout O tempo de ligação expirou @@ -1070,7 +1070,8 @@ Itens verificados também serão removidos se evitarem que um diretório seja re A new update for %1 is about to be installed. The updater may ask for additional privileges during the process. - + Uma nova atualização para %1 está prestes a ser instalada. O atualizador pode pedir +privilégios adicionais durante o processo. @@ -1244,12 +1245,12 @@ It is not advisable to use it. The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured. - + O pedido de autenticação ao servidor foi redirecionado para '%1'. O URL é mau, o servidor está mal configurado. There was an invalid response to an authenticated webdav request - + Houve uma resposta inválida ao pedido de autenticação webdav @@ -1264,7 +1265,7 @@ It is not advisable to use it. Creating local sync folder %1... - + A criar a pasta de sincronização local %1... @@ -1393,7 +1394,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout O tempo de ligação expirou @@ -1401,7 +1402,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL Resposta JSON inválida do URL poll @@ -1437,24 +1438,24 @@ It is not advisable to use it. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! O ficheiro %1 não pode ser descarregado devido a conflito com um nome de ficheiro local! - + The file could not be downloaded completely. Não foi possível transferir o ficheiro na totalidade. - + File %1 cannot be saved because of a local file name clash! Ficheiro %1 não pode ser guardado devido à existência de um ficheiro local com o mesmo nome. - + File has changed since discovery - + O ficheiro alterou-se desde a sua descoberta @@ -1498,7 +1499,7 @@ It is not advisable to use it. Could not remove directory '%1'; - + Não foi possível remover o diretório '%1'; @@ -1524,7 +1525,7 @@ It is not advisable to use it. Wrong HTTP code returned by server. Expected 204, but received "%1 %2". - + Código HTTP errado devolvido pelo servidor. Esperado 204, mas foi recebido "%1 %2". @@ -1532,7 +1533,7 @@ It is not advisable to use it. Wrong HTTP code returned by server. Expected 201, but received "%1 %2". - + Código HTTP errado devolvido pelo servidor. Esperado 201, mas foi recebido "%1 %2". @@ -1555,7 +1556,7 @@ It is not advisable to use it. Wrong HTTP code returned by server. Expected 201, but received "%1 %2". - + Código HTTP errado devolvido pelo servidor. Esperado 201, mas foi recebido "%1 %2". @@ -1580,38 +1581,43 @@ It is not advisable to use it. OCC::PropagateUploadFileQNAM - + File Removed Ficheiro Eliminado - - + + Local file changed during syncing. It will be resumed. + + + + + Local file changed during sync. Ficheiro local alterado durante a sincronização. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + A forçar aborto no trabalho de redefinição de conexão HTTP com Qt < 5.4.3 - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. O ficheiro foi editado localmente mas faz parte de uma prtilha só de leitura. Foi restaurado mas a edição está no ficheiro de conflito. - + Poll URL missing URL poll em falta - + The local file was removed during sync. O arquivo local foi removido durante a sincronização. - + The server did not acknowledge the last chunk. (No e-tag were present) O servidor não reconheceu o último bloco. (Nenhuma e-tag estava presente) @@ -1749,12 +1755,12 @@ It is not advisable to use it. No subfolders currently on the server. - + Atualmente não há sub-pastas no servidor. An error occured while loading the list of sub folders. - + Ocorreu um erro ao carregar a lista de sub-pastas. @@ -1894,7 +1900,7 @@ It is not advisable to use it. The file can not be shared because it was shared without sharing permission. - + O ficheiro não pode ser partilhado porque foi partilhado sem permissão de partilha. @@ -1915,12 +1921,12 @@ It is not advisable to use it. Cannot find an folder to upload to. - + Não é possível encontrar uma pasta para enviar. A sync file with the same name exists. The file cannot be registered to sync. - + Existe um ficheiro sincronizado com o mesmo nome. O ficheiro não pode ser registado para sincronização. @@ -1935,7 +1941,7 @@ It is not advisable to use it. Public sh&aring requires a password - + A pa&rtilha pública requer uma palavra-passe: @@ -2304,22 +2310,22 @@ It is not advisable to use it. CSync failed to access - + CSync falhou o acesso The service is temporarily unavailable - + O serviço está temporariamente indisponível An error occurred while opening a directory - + Ocorreu um erro ao abrir um diretório An internal error number %1 occurred. - + Ocorreu o erro interno número %1. @@ -2357,69 +2363,69 @@ It is not advisable to use it. Codificação de nome de ficheiro não é válida - + Unable to initialize a sync journal. Impossível inicializar sincronização 'journal'. - + Cannot open the sync journal Impossível abrir o jornal de sincronismo - - + + Ignored because of the "choose what to sync" blacklist Ignorado devido à blacklist de escolha para sincronização - + Not allowed because you don't have permission to add sub-directories in that directory Não permitido, porque não tem permissão para adicionar sub-directórios ao directório - + Not allowed because you don't have permission to add parent directory Não permitido, porque não tem permissão para adicionar o directório principal - + Not allowed because you don't have permission to add files in that directory Não permitido, porque não tem permissão para adicionar ficheiros no directório - + Not allowed to upload this file because it is read-only on the server, restoring Não é permitido fazer o envio deste ficheiro porque é só de leitura no servidor, restaurando - - + + Not allowed to remove, restoring Não autorizado para remoção, restaurando - + Local files and share folder removed. Ficheiros locais e pasta partilhada removidos. - + Move not allowed, item restored Mover não foi permitido, item restaurado - + Move not allowed because %1 is read-only Mover não foi autorizado porque %1 é só de leitura - + the destination o destino - + the source a origem @@ -2435,21 +2441,35 @@ It is not advisable to use it. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> <p>Versão %1. Para mais informações visite <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> <p>Copyright ownCloud, Incorporado</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> <p>Distribuído por %1 e licenciado sob a GNU General Public License (GPL) Versão 2.0.<br/>%2 e o logótipo %2 são marcas registadas da %1 nos Estados Unidos, outros países, ou ambos </p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + + + + + The downloaded file does not match the checksum, it will be resumed. + + + OCC::ownCloudGui @@ -2722,8 +2742,8 @@ It is not advisable to use it. Error Label - - + + TextLabel TextLabel @@ -2843,27 +2863,27 @@ It is not advisable to use it. Utility - + %L1 TiB %L1 TiB - + %L1 GiB %L1 GiB - + %L1 MiB %L1 MiB - + %L1 KiB %L1 KiB - + %L1 B %L1 B @@ -2884,9 +2904,9 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> - + <p><small>Construído a partir da revisão Git <a href="%1">%2</a> em %3, %4 usando Qt %5, %6</small></p> @@ -2904,7 +2924,7 @@ It is not advisable to use it. Downloaded, renamed conflicting file - + Descarregado, ficheiro em conflito renomeado diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index e17f9591b..cc7aa88d7 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time O arquivo de destino tem um tamanho ou tempo de modificação inesperado @@ -81,53 +81,53 @@ Conectado com <server> como <user> - + Add Folder... Adicionar Pasta... - + Pause Pausa - + Remove Remover - + Choose What to Sync Escolher o que Sincronizar - + Storage Usage Uso de Armazenamento - + Retrieving usage information... Recuperando informações sobre o uso... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Nota:</b> Algumas pastas, incluindo as montadas na rede ou pastas compartilhadas, podem ter limites diferentes. - + Account Maintenance Manutenção de Conta - + Edit Ignored Files Editar Arquivos Ignorados - + Modify Account Modificar Conta @@ -713,22 +713,22 @@ Você tem certeza que quer executar esta operação? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Nenhuma E-Tag recebida do servidor, verifique Proxy / gateway - + We received a different E-Tag for resuming. Retrying next time. Recebemos um e-Tag diferente para resumir. Tente uma próxima vez. - + Server returned wrong content-range O servidor retornou erro numa série-de-conteúdo - + Connection Timeout Conexão Finalizada @@ -1395,7 +1395,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout Conexão Finalizada @@ -1403,7 +1403,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL Resposta JSON inválida a partir do conjunto de URL @@ -1439,22 +1439,22 @@ It is not advisable to use it. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! O arquivo %1 não pode ser baixado por causa de um confronto local no nome do arquivo! - + The file could not be downloaded completely. O arquivo não pode ser baixado completamente. - + File %1 cannot be saved because of a local file name clash! O arquivo %1 não pode ser salvo por causa de um confronto com um nome de arquivo local! - + File has changed since discovery Arquivo foi alterado desde a descoberta @@ -1582,38 +1582,43 @@ It is not advisable to use it. OCC::PropagateUploadFileQNAM - + File Removed Arquivo Removido - - + + Local file changed during syncing. It will be resumed. + Arquivo local alterado durante a sincronização. Ele será retomado. + + + + Local file changed during sync. Arquivo local modificado durante a sincronização. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. Forçando cancelamento do trabalho em redefinição de conexão HTTP com o Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. O arquivo foi editado localmente mas faz parte de compartilhamento só de leitura. Ele foi restaurado mas sua edição está em conflito com o arquivo. - + Poll URL missing Faltando conjunto de URL - + The local file was removed during sync. O arquivo local foi removido durante a sincronização. - + The server did not acknowledge the last chunk. (No e-tag were present) O servidor não reconheceu o último bloco. (Nenhuma e-tag estava presente) @@ -1689,13 +1694,16 @@ It is not advisable to use it. %n files are ignored because of previous errors. - + %n arquivo foi ignorado por causa dos erros anteriores.%n arquivos foram ignorados por causa dos erros anteriores. + %n files are partially downloaded. - + %n arquivo foi parcialmente baixado. +%n arquivos foram parcialmente baixados. + @@ -2355,69 +2363,69 @@ It is not advisable to use it. A codificação do nome do arquivo não é válida - + Unable to initialize a sync journal. Impossibilitado de iniciar a sincronização. - + Cannot open the sync journal Não é possível abrir o arquivo de sincronização - - + + Ignored because of the "choose what to sync" blacklist Ignorado por causa da lista negra "escolher o que sincronizar" - + Not allowed because you don't have permission to add sub-directories in that directory Não permitido porque você não tem permissão de criar sub-pastas nesta pasta - + Not allowed because you don't have permission to add parent directory Não permitido porque você não tem permissão de criar pastas mãe - + Not allowed because you don't have permission to add files in that directory Não permitido porque você não tem permissão de adicionar arquivos a esta pasta - + Not allowed to upload this file because it is read-only on the server, restoring Não é permitido fazer o upload deste arquivo porque ele é somente leitura no servidor, restaurando - - + + Not allowed to remove, restoring Não é permitido remover, restaurando - + Local files and share folder removed. Arquivos locais e pasta compartilhada removida. - + Move not allowed, item restored Não é permitido mover, item restaurado - + Move not allowed because %1 is read-only Não é permitido mover porque %1 é somente para leitura - + the destination o destino - + the source a fonte @@ -2433,21 +2441,35 @@ It is not advisable to use it. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> <p>Versão %1. Para mais informações por favor visite <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> <p>Copyright ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> <p>Distribuído por %1 e licenciado sobre a GNU General Public License (GPL) Versão 2.0.<br/>%2 e o %2 logo são marcas registradas de %1 nos Estados Unidos, outros países ou ambos.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + O cabeçalho de checksum está incorreto. + + + + The downloaded file does not match the checksum, it will be resumed. + O arquivo baixado não coincide com o checksum, ele será retomado. + + OCC::ownCloudGui @@ -2720,8 +2742,8 @@ It is not advisable to use it. Rótulo de Erro - - + + TextLabel TextLabel @@ -2841,27 +2863,27 @@ It is not advisable to use it. Utility - + %L1 TiB %L1 TiB - + %L1 GiB %L1 GiB - + %L1 MiB %L1 MiB - + %L1 KiB %L1 KiB - + %L1 B %L1 B @@ -2882,7 +2904,7 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> <p><small>Construído a partir de revisão Git <a href="%1">%2</a> em %3, %4 usando Qt %5, %6</small></p> diff --git a/translations/client_ru.ts b/translations/client_ru.ts index b74e2a594..82323b43b 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time @@ -81,53 +81,53 @@ Подключен к <server> как <user> - + Add Folder... Добавить каталог... - + Pause Пауза - + Remove Удалить - + Choose What to Sync Уточнить объекты - + Storage Usage Использование хранилища - + Retrieving usage information... Получение информации об использовании... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Заметка:</b> Некоторые каталоги, включая сетевые или общие, могут иметь разные ограничения. - + Account Maintenance Обслуживание учётной записи - + Edit Ignored Files Игнорируемые файлы - + Modify Account Изменить учётную запись @@ -713,22 +713,22 @@ Are you sure you want to perform this operation? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway E-Tag от сервера не получен, проверьте настройки прокси/шлюза. - + We received a different E-Tag for resuming. Retrying next time. Мы получили другой E-Tag для возобновления. Повторите попытку позже. - + Server returned wrong content-range Сервер вернул неверный диапазон содержимого - + Connection Timeout Время ожидания подключения истекло @@ -1396,7 +1396,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout Время ожидания подключения истекло @@ -1404,7 +1404,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL Не правильный JSON ответ на сформированный URL @@ -1440,22 +1440,22 @@ It is not advisable to use it. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! Файл %1 не может быть загружен из-за локального конфликта имен! - + The file could not be downloaded completely. Невозможно полностью загрузить файл. - + File %1 cannot be saved because of a local file name clash! Файл %1 не может быть сохранён из-за локального конфликта имен! - + File has changed since discovery @@ -1583,38 +1583,43 @@ It is not advisable to use it. OCC::PropagateUploadFileQNAM - + File Removed Файл Перемещён - - + + Local file changed during syncing. It will be resumed. + + + + + Local file changed during sync. Локальный файл изменился в процессе синхронизации. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. Измененный файл принадлежит удаленному общему ресурсу только для чтения. Файл был восстановлен, ваши правки доступны в файле конфликтов. - + Poll URL missing Не хватает сформированного URL - + The local file was removed during sync. Локальный файл был удалён в процессе синхронизации. - + The server did not acknowledge the last chunk. (No e-tag were present) Сервер не смог подтвердить последнюю часть данных.(Отсутствовали теги e-tag) @@ -2364,69 +2369,69 @@ It is not advisable to use it. Кодировка имени файла не верна - + Unable to initialize a sync journal. Невозможно инициализировать журнал синхронизации. - + Cannot open the sync journal Не удаётся открыть журнал синхронизации - - + + Ignored because of the "choose what to sync" blacklist Игнорируется из-за черного списка в "что синхронизировать" - + Not allowed because you don't have permission to add sub-directories in that directory Не допускается, так как у вас нет прав для создания подкаталогов в этом каталоге - + Not allowed because you don't have permission to add parent directory Не допускается, так как у вас нет прав для создания родительской папки - + Not allowed because you don't have permission to add files in that directory Не допускается, так как у вас нет прав для добавления файлов в этот каталог - + Not allowed to upload this file because it is read-only on the server, restoring Не допускается загрузка этого файла, так как на сервере он помечен только для чтения, восстанавливаем - - + + Not allowed to remove, restoring Не допускается удаление, восстанавливаем - + Local files and share folder removed. Локальные файлы и общий каталог удалены. - + Move not allowed, item restored Перемещение не допускается, элемент восстановлен - + Move not allowed because %1 is read-only Перемещение не допускается, поскольку %1 помечен только для чтения - + the destination назначение - + the source источник @@ -2442,21 +2447,35 @@ It is not advisable to use it. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> <p>Версия %1. Для получения дополнительной информации посетите <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> <p>Права принадлежат ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> <p>Распространяется %1 и лицензировано под GNU General Public License (GPL) Версии 2.0.<br/>Логотипы %2 и %2 являются зарегистрированной торговой маркой %1 в США и/или других странах.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + + + + + The downloaded file does not match the checksum, it will be resumed. + + + OCC::ownCloudGui @@ -2729,8 +2748,8 @@ It is not advisable to use it. Ярлык Ошибки - - + + TextLabel TextLabel @@ -2850,27 +2869,27 @@ It is not advisable to use it. Utility - + %L1 TiB %L1 ТиБ - + %L1 GiB %L1 ГиБ - + %L1 MiB %L1 МиБ - + %L1 KiB %L1 КиБ - + %L1 B %L1 Б @@ -2891,7 +2910,7 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> <p><small>Собрано исходников Git версии <a href="%1">%2</a> на %3, %4 используя Qt %5, %6</small></p> diff --git a/translations/client_sk.ts b/translations/client_sk.ts index d79e46b74..0f66e7e32 100644 --- a/translations/client_sk.ts +++ b/translations/client_sk.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time @@ -81,53 +81,53 @@ Spojené z <server> ako <user> - + Add Folder... Pridať priečinok... - + Pause Pauza - + Remove Odobrať - + Choose What to Sync Vybrať čo synchronizovať - + Storage Usage Využitie úložného priestoru - + Retrieving usage information... Získavam informácie o využití... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Poznámka:<b> Niektoré priečinky, vrátane sieťových alebo zdieľaných, môžu mať odlišné limity. - + Account Maintenance Údržba účtov - + Edit Ignored Files Upraviť ignorované súbory - + Modify Account Upraviť účet @@ -713,22 +713,22 @@ Ste si istý, že chcete uskutočniť danú operáciu? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Zo servera nebol prijatý E-Tag, skontrolujte proxy/bránu - + We received a different E-Tag for resuming. Retrying next time. Prijali sme iný E-Tag pre pokračovanie. Skúsim to neskôr znovu. - + Server returned wrong content-range Server vrátil nesprávnu hodnotu Content-range - + Connection Timeout Spojenie vypršalo @@ -1395,7 +1395,7 @@ Nie je vhodné ju používať. OCC::PUTFileJob - + Connection Timeout Spojenie vypršalo @@ -1403,7 +1403,7 @@ Nie je vhodné ju používať. OCC::PollJob - + Invalid JSON reply from the poll URL Neplatná JSON odpoveď z URL adresy @@ -1439,22 +1439,22 @@ Nie je vhodné ju používať. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! Súbor %1 nie je možné stiahnuť, pretože súbor s rovnakým menom už existuje! - + The file could not be downloaded completely. Súbor sa nedá stiahnuť úplne. - + File %1 cannot be saved because of a local file name clash! Súbor %1 nie je možné uložiť, pretože jeho názov koliduje s názvom lokálneho súboru! - + File has changed since discovery @@ -1582,38 +1582,43 @@ Nie je vhodné ju používať. OCC::PropagateUploadFileQNAM - + File Removed Súbor zmazaný - - + + Local file changed during syncing. It will be resumed. + + + + + Local file changed during sync. Lokálny súbor bol zmenený počas synchronizácie. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. Súbor bol zmenený, ale je súčasťou zdieľania len na čítanie. Pôvodný súbor bol obnovený a upravená verzia je uložená v konfliktnom súbore. - + Poll URL missing Chýba URL adresa - + The local file was removed during sync. Lokálny súbor bol odstránený počas synchronizácie. - + The server did not acknowledge the last chunk. (No e-tag were present) Server nepotvrdil posledný kúsok. (Nebol prítomný e-tag) @@ -2361,69 +2366,69 @@ Nie je vhodné ju používať. Kódovanie znakov názvu súboru je neplatné - + Unable to initialize a sync journal. Nemôžem inicializovať synchronizačný žurnál. - + Cannot open the sync journal Nemožno otvoriť sync žurnál - - + + Ignored because of the "choose what to sync" blacklist Ignorované podľa nastavenia "vybrať čo synchronizovať" - + Not allowed because you don't have permission to add sub-directories in that directory Nie je dovolené, pretože nemáte oprávnenie pridávať do tohto priečinka podpriečinky - + Not allowed because you don't have permission to add parent directory Nie je dovolené, pretože nemáte oprávnenie pridať nadradený priečinok. - + Not allowed because you don't have permission to add files in that directory Nie je dovolené, pretože nemáte oprávnenie pridávať do tohto priečinka súbory. - + Not allowed to upload this file because it is read-only on the server, restoring Nie je dovolené tento súbor nahrať, pretože je na serveri iba na čítanie. Obnovuje sa. - - + + Not allowed to remove, restoring Nie je dovolené odstrániť. Obnovuje sa. - + Local files and share folder removed. Lokálne súbory a zdieľaný priečinok boli odstránené. - + Move not allowed, item restored Presunutie nie je dovolené. Položka obnovená. - + Move not allowed because %1 is read-only Presunutie nie je dovolené, pretože %1 je na serveri iba na čítanie - + the destination cieľ - + the source zdroj @@ -2439,21 +2444,35 @@ Nie je vhodné ju používať. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> <p>Verzia %1. Pre viac informácií choďte na <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> <p>Copyright ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> <p>Šíri %1 pod licenciou GNU General Public License (GPL) Verzia 2.0.<br/>%2 a %2 logo sú registrované známky %1 v USA, ostatných krajinách, alebo oboje.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + + + + + The downloaded file does not match the checksum, it will be resumed. + + + OCC::ownCloudGui @@ -2726,8 +2745,8 @@ Nie je vhodné ju používať. Chybová značka - - + + TextLabel Štítok @@ -2847,27 +2866,27 @@ Nie je vhodné ju používať. Utility - + %L1 TiB %L1 TiB - + %L1 GiB %L1 GiB - + %L1 MiB %L1 MiB - + %L1 KiB %L1 KiB - + %L1 B %L1 B @@ -2888,7 +2907,7 @@ Nie je vhodné ju používať. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> diff --git a/translations/client_sl.ts b/translations/client_sl.ts index dfb3ade85..9d7f7ae8e 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time @@ -81,53 +81,53 @@ Vzpostavljena je povezava s strežnikom <server> kot <user> - + Add Folder... Dodaj mapo ... - + Pause Premor - + Remove Odstrani - + Choose What to Sync Izbor datotek za usklajevanje - + Storage Usage Poraba prostora - + Retrieving usage information... Pridobivanje podatkov o prostoru ... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Opomba:</b> nekatere mape, vključno s priklopljenimi mapami in mapami v souporabi, imajo morda različne omejitve. - + Account Maintenance Upravljanje računa - + Edit Ignored Files Uredi prezrte datoteke - + Modify Account Spremeni račun @@ -713,22 +713,22 @@ Ali sta prepričani, da želite izvesti to opravilo? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Ni prejete oznake s strežnika. Preveriti je treba podatke posredovalnega strežnika ali prehoda. - + We received a different E-Tag for resuming. Retrying next time. Prejeta je različna oznaka za nadaljevanje opravila. Ponovni poskus bo izveden kasneje. - + Server returned wrong content-range Odziv strežnika kaže na neveljaven obseg vsebine - + Connection Timeout Povezava je časovno potekla @@ -1395,7 +1395,7 @@ Uporaba ni priporočljiva. OCC::PUTFileJob - + Connection Timeout Povezava časovno pretekla @@ -1403,7 +1403,7 @@ Uporaba ni priporočljiva. OCC::PollJob - + Invalid JSON reply from the poll URL @@ -1439,22 +1439,22 @@ Uporaba ni priporočljiva. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! Datoteke %1 ni mogoče prejeti zaradi neskladja z imenom krajevne datoteke! - + The file could not be downloaded completely. Datoteke ni mogoče v celoti prejeti. - + File %1 cannot be saved because of a local file name clash! Datoteke %1 ni mogoče shraniti zaradi neskladja z imenom obstoječe datoteke! - + File has changed since discovery @@ -1582,38 +1582,43 @@ Uporaba ni priporočljiva. OCC::PropagateUploadFileQNAM - + File Removed Datoteka je odstranjena - - + + Local file changed during syncing. It will be resumed. + + + + + Local file changed during sync. Krajevna datoteka je bila med usklajevanjem spremenjena. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. Datoteka je bila krajevno spremenjena, vendar pa je označena za souporabo le za branje. Izvorna datoteka je obnovljena, vaše spremembe pa so zabeležene v datoteki spora. - + Poll URL missing - + The local file was removed during sync. Krajevna datoteka je bila me usklajevanjem odstranjena. - + The server did not acknowledge the last chunk. (No e-tag were present) Strežnik ni prepoznal zadnjega niza besed. (ni določenih e-oznak) @@ -2355,69 +2360,69 @@ Uporaba ni priporočljiva. Kodni zapis imena datoteke ni veljaven. - + Unable to initialize a sync journal. Dnevnika usklajevanja ni mogoče začeti. - + Cannot open the sync journal Ni mogoče odpreti dnevnika usklajevanja - - + + Ignored because of the "choose what to sync" blacklist Prezrto, ker ni neizbrano za usklajevanje - + Not allowed because you don't have permission to add sub-directories in that directory Ni ustreznih dovoljenj za dodajanje podmap v izbrano mapo. - + Not allowed because you don't have permission to add parent directory Ni ustreznih dovoljenj za dodajanje nadrejene mape. - + Not allowed because you don't have permission to add files in that directory Ni ustreznih dovoljenj za dodajanje datotek v izbrano mapo. - + Not allowed to upload this file because it is read-only on the server, restoring Ni dovoljeno pošiljati te datoteke, ker ima določena dovoljenja le za branje. Datoteka bo obnovljena na izvorno različico. - - + + Not allowed to remove, restoring Odstranitev ni dovoljena, datoteka bo obnovljena. - + Local files and share folder removed. Krajevne datoteke in mape v souporabi so odstranjene. - + Move not allowed, item restored Premikanje ni dovoljeno, datoteka bo obnovljena. - + Move not allowed because %1 is read-only Premikanje ni dovoljeno, ker je nastavljeno določilo %1 le za branje. - + the destination cilj - + the source vir @@ -2433,21 +2438,35 @@ Uporaba ni priporočljiva. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> <p>Različica %1. Za več podrobnosti si oglejte <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> <p>Programski paket objavlja %1 pod pogoji Splošnega javnega dovoljenja GNU (GNU General Public License - GPL), različice 2.0.<br>%2 in logotip %2 sta blagovni znamki %1 v Združenih državah, drugih državah ali oboje.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + + + + + The downloaded file does not match the checksum, it will be resumed. + + + OCC::ownCloudGui @@ -2720,8 +2739,8 @@ Uporaba ni priporočljiva. Oznaka napake - - + + TextLabel Besedilna oznaka @@ -2841,27 +2860,27 @@ Uporaba ni priporočljiva. Utility - + %L1 TiB %L1 TiB - + %L1 GiB %L1 GiB - + %L1 MiB %L1 MiB - + %L1 KiB %L1 KiB - + %L1 B %L1 B @@ -2882,7 +2901,7 @@ Uporaba ni priporočljiva. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> diff --git a/translations/client_sr.ts b/translations/client_sr.ts index 50f2cc14e..9d5ad2e87 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time Одредишни фајл има неочекивану величину или време измене @@ -81,53 +81,53 @@ Повезан са <server> као <user> - + Add Folder... Додај фасциклу... - + Pause Паузирај - + Remove Уклони - + Choose What to Sync Избор шта синхронизовати - + Storage Usage Заузетост складишта - + Retrieving usage information... Добављам податке о заузећу... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Напомена:</b> Неке фасцикле, укључујући монтиране или дељене фасцикле, могу имати различита ограничења. - + Account Maintenance Одржавање налога - + Edit Ignored Files Уреди игнорисане фајлове - + Modify Account Измени налог @@ -713,22 +713,22 @@ Are you sure you want to perform this operation? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Нема е-ознаке са сервера. Проверите прокси или мрежни излаз - + We received a different E-Tag for resuming. Retrying next time. Добијена је различита е-ознака за наставак преноса. Покушаћу поново следећи пут. - + Server returned wrong content-range Сервер је вратио погрешан опсег садржаја - + Connection Timeout Време за повезивање је истекло @@ -1396,7 +1396,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout Веза је истекла @@ -1404,7 +1404,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL Неисправан ЈСОН одговор са адресе упита @@ -1440,22 +1440,22 @@ It is not advisable to use it. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! Фајл %1 се не може преузети јер се судара са називом локалног фајла! - + The file could not be downloaded completely. Фајл није могао бити преузет у потпуности. - + File %1 cannot be saved because of a local file name clash! Фајл %1 се не може сачувати јер се судара са називом локалног фајла! - + File has changed since discovery Фајл је измењен у међувремену @@ -1583,38 +1583,43 @@ It is not advisable to use it. OCC::PropagateUploadFileQNAM - + File Removed Фајл уклоњен - - + + Local file changed during syncing. It will be resumed. + + + + + Local file changed during sync. Локални фајл измењен током синхронизације. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. Присили прекид посла код прекида ХТТП везе са КуТ < 5.4.2 - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. Фајл је измењен локално али је у саставу дељења које је само за читање. Враћен је у претходно стање а измене су у фајлу сукоба. - + Poll URL missing Адреса упита недостаје - + The local file was removed during sync. Локални фајл је уклоњен током синхронизације. - + The server did not acknowledge the last chunk. (No e-tag were present) Сервер није потврдио последње парче. (није било е-ознаке) @@ -2362,69 +2367,69 @@ It is not advisable to use it. Кодирање назива фајла није исправно - + Unable to initialize a sync journal. Није могуће покренути у синхронизацију дневника. - + Cannot open the sync journal Не могу да отворим дневник синхронизације - - + + Ignored because of the "choose what to sync" blacklist Игнорисано јер се не налази на листи за синхронизацију - + Not allowed because you don't have permission to add sub-directories in that directory Није могуће јер немате дозволу да додајете поддиректоријуме у тај директоријум - + Not allowed because you don't have permission to add parent directory Није могуће јер немате дозволу да додајете наддиректоријум - + Not allowed because you don't have permission to add files in that directory Није могуће јер немате дозволу да додајете фајлове у тај директоријум - + Not allowed to upload this file because it is read-only on the server, restoring Није могуће отпремити овај фајл јер је на серверу само за читање. Враћам - - + + Not allowed to remove, restoring Није могуће уклањање. Враћам - + Local files and share folder removed. Локални фајлови и дељена фасцикла су уклоњени. - + Move not allowed, item restored Премештање није дозвољено. Ставка је враћена - + Move not allowed because %1 is read-only Премештање није дозвољено јер %1 је само за читање - + the destination одредиште - + the source извор @@ -2440,21 +2445,35 @@ It is not advisable to use it. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> <p>Верзија %1. За више информација посетите <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> <p>Ауторска права оунКлауд (ownCloud), корпорација</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> <p>Дистрибуира %1 под ГНУ општом јавном лиценцом (ОЈЛ) верзија 2.0.<br/>%2 и %2 лого су регистроване марке %1 у САД, другим земљама или обоје</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + + + + + The downloaded file does not match the checksum, it will be resumed. + + + OCC::ownCloudGui @@ -2727,8 +2746,8 @@ It is not advisable to use it. Ознака грешке - - + + TextLabel Текст ознака @@ -2848,27 +2867,27 @@ It is not advisable to use it. Utility - + %L1 TiB %L1 TiB - + %L1 GiB %L1 GiB - + %L1 MiB %L1 MiB - + %L1 KiB %L1 KiB - + %L1 B %L1 B @@ -2889,7 +2908,7 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> <p><small>Направљено од ГИТ ревизије <a href="%1">%2</a> %3, %4 користећи КуТ %5, %6</small></p> diff --git a/translations/client_sv.ts b/translations/client_sv.ts index 2d5dbbea7..32693a6ba 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time @@ -81,53 +81,53 @@ Ansluten till <server> som <user> - + Add Folder... Lägg till mapp - + Pause Paus - + Remove Radera - + Choose What to Sync Välj vad som ska synkas - + Storage Usage Lagringsutrymme - + Retrieving usage information... Hämtar information om användning... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Notera:</b> Vissa mappar, inklusive nätverksmonterade eller delade mappar, kan ha olika begränsningar - + Account Maintenance Hantera ditt konto - + Edit Ignored Files Ändra ignorerade filer - + Modify Account Ändra konto @@ -713,22 +713,22 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Ingen E-Tag mottogs från servern, kontrollera proxy/gateway - + We received a different E-Tag for resuming. Retrying next time. Vi mottog en helt annan e-tag för att återuppta. Försök igen nästa gång. - + Server returned wrong content-range Servern returnerade felaktig content-range - + Connection Timeout Anslutningen avbröts på grund av timeout @@ -1395,7 +1395,7 @@ Det är inte lämpligt använda den. OCC::PUTFileJob - + Connection Timeout Anslutningen avbröts på grund av timeout @@ -1403,7 +1403,7 @@ Det är inte lämpligt använda den. OCC::PollJob - + Invalid JSON reply from the poll URL @@ -1439,22 +1439,22 @@ Det är inte lämpligt använda den. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! Fil %1 kan inte laddas ner på grund av namnkonflikt med en lokal fil! - + The file could not be downloaded completely. Filen kunde inte laddas ner fullständigt. - + File %1 cannot be saved because of a local file name clash! Fil %1 kan inte sparas eftersom namnet krockar med en lokal fil! - + File has changed since discovery @@ -1582,38 +1582,43 @@ Det är inte lämpligt använda den. OCC::PropagateUploadFileQNAM - + File Removed Filen Raderad - - + + Local file changed during syncing. It will be resumed. + + + + + Local file changed during sync. Lokal fil ändrades under synk. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. Filen ändrades lokalt men är en del av en endast-läsbar delning. Den återställdes och din editering är i konflikt filen. - + Poll URL missing - + The local file was removed during sync. Den lokala filen togs bort under synkronisering. - + The server did not acknowledge the last chunk. (No e-tag were present) Servern bekräftade inte det sista fil-fragmentet (Ingen e-tag fanns tillgänglig) @@ -2355,69 +2360,69 @@ Det är inte lämpligt använda den. Filnamnskodning är inte giltig - + Unable to initialize a sync journal. Kan inte initialisera en synk journal. - + Cannot open the sync journal Kunde inte öppna synk journalen - - + + Ignored because of the "choose what to sync" blacklist Ignorerad eftersom den är svartlistad i "välj vad som ska synkas" - + Not allowed because you don't have permission to add sub-directories in that directory Går ej att genomföra då du saknar rättigheter att lägga till underkataloger i den katalogen - + Not allowed because you don't have permission to add parent directory Går ej att genomföra då du saknar rättigheter att lägga till någon moderkatalog - + Not allowed because you don't have permission to add files in that directory Går ej att genomföra då du saknar rättigheter att lägga till filer i den katalogen - + Not allowed to upload this file because it is read-only on the server, restoring Inte behörig att ladda upp denna fil då den är skrivskyddad på servern, återställer - - + + Not allowed to remove, restoring Inte behörig att radera, återställer - + Local files and share folder removed. Lokala filer och mappar som är delade är borttagna. - + Move not allowed, item restored Det gick inte att genomföra flytten, objektet återställs - + Move not allowed because %1 is read-only Det gick inte att genomföra flytten då %1 är skrivskyddad - + the destination destinationen - + the source källan @@ -2433,21 +2438,35 @@ Det är inte lämpligt använda den. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> <p>Version %1. För mer information vänligen besök <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> <p>Distribueras av %1 och licenserad under GNU General Public License (GPL) Version 2.0.<br/>%2 och %2 logotyp är registrerade varumärken av %1 i Förenta Staterna, andra länder, eller både och.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + + + + + The downloaded file does not match the checksum, it will be resumed. + + + OCC::ownCloudGui @@ -2720,8 +2739,8 @@ Det är inte lämpligt använda den. Felmeddelande - - + + TextLabel Textetikett @@ -2841,27 +2860,27 @@ Det är inte lämpligt använda den. Utility - + %L1 TiB - + %L1 GiB - + %L1 MiB - + %L1 KiB - + %L1 B %L1 B @@ -2882,7 +2901,7 @@ Det är inte lämpligt använda den. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> diff --git a/translations/client_th.ts b/translations/client_th.ts index 746d683d8..fb366019b 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time @@ -81,53 +81,53 @@ - + Add Folder... - + Pause หยุดชั่วคราว - + Remove ลบออก - + Choose What to Sync - + Storage Usage - + Retrieving usage information... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. - + Account Maintenance - + Edit Ignored Files - + Modify Account @@ -710,22 +710,22 @@ Are you sure you want to perform this operation? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway - + We received a different E-Tag for resuming. Retrying next time. - + Server returned wrong content-range - + Connection Timeout @@ -1389,7 +1389,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout @@ -1397,7 +1397,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL @@ -1433,22 +1433,22 @@ It is not advisable to use it. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! - + The file could not be downloaded completely. - + File %1 cannot be saved because of a local file name clash! - + File has changed since discovery @@ -1576,38 +1576,43 @@ It is not advisable to use it. OCC::PropagateUploadFileQNAM - + File Removed - - + + Local file changed during syncing. It will be resumed. + + + + + Local file changed during sync. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. - + Poll URL missing - + The local file was removed during sync. - + The server did not acknowledge the last chunk. (No e-tag were present) @@ -2347,69 +2352,69 @@ It is not advisable to use it. - + Unable to initialize a sync journal. - + Cannot open the sync journal - - + + Ignored because of the "choose what to sync" blacklist - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Local files and share folder removed. - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source @@ -2425,21 +2430,35 @@ It is not advisable to use it. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + + + + + The downloaded file does not match the checksum, it will be resumed. + + + OCC::ownCloudGui @@ -2712,8 +2731,8 @@ It is not advisable to use it. - - + + TextLabel ป้ายข้อความ @@ -2833,27 +2852,27 @@ It is not advisable to use it. Utility - + %L1 TiB - + %L1 GiB - + %L1 MiB - + %L1 KiB - + %L1 B @@ -2874,7 +2893,7 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 0fb815732..951b175b5 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time @@ -81,53 +81,53 @@ <server> ile <user> olarak bağlantı kuruldu - + Add Folder... Klasör Ekle... - + Pause Duraklat - + Remove Kaldır - + Choose What to Sync Ne Eşitleneceğini Seçin - + Storage Usage Depolama Kullanımı - + Retrieving usage information... Kullanım bilgisi alınıyor... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Not:</b> Ağa bağlanmış veya paylaşılan klasörler de dahil olmak üzere bazı klasörler, farklı sınırlara sahip olabilirler. - + Account Maintenance Hesap Bakımı - + Edit Ignored Files Yoksayılan Dosyaları Düzenle - + Modify Account Hesabı Düzenle @@ -713,22 +713,22 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Sunucudan E-Tag alınamadı, Vekil Sunucu/Ağ Geçidi'ni denetleyin. - + We received a different E-Tag for resuming. Retrying next time. Devam etmek üzere farklı bir E-Etiket aldık. Sonraki işlemde yeniden denenecek. - + Server returned wrong content-range Sunucu yanlış içerik aralığı döndürdü - + Connection Timeout Bağlantı Zaman Aşımı @@ -1395,7 +1395,7 @@ Kullanmanız önerilmez. OCC::PUTFileJob - + Connection Timeout Bağlantı Zaman Aşımı @@ -1403,7 +1403,7 @@ Kullanmanız önerilmez. OCC::PollJob - + Invalid JSON reply from the poll URL Getirme URL'sinden geçersiz JSON yanıtı @@ -1439,22 +1439,22 @@ Kullanmanız önerilmez. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! %1 dosyası, yerel dosya adı çakışması nedeniyle indirilemiyor! - + The file could not be downloaded completely. Dosya tamamıyla indirilemedi. - + File %1 cannot be saved because of a local file name clash! Yerel bir dosya ismi ile çakıştığından, %1 dosyası kaydedilemedi! - + File has changed since discovery @@ -1582,38 +1582,43 @@ Kullanmanız önerilmez. OCC::PropagateUploadFileQNAM - + File Removed Dosya Kaldırıldı - - + + Local file changed during syncing. It will be resumed. + + + + + Local file changed during sync. Eşitleme sırasında yerel dosya değişti. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. Dosya yerel olarak düzenlendi ancak salt okunur paylaşımın bir parçası. Geri yüklendi ve düzenlemeniz çakışan dosyada. - + Poll URL missing Getirme URL'si eksik - + The local file was removed during sync. Eşitleme sırasında yerel dosya kaldırıldı. - + The server did not acknowledge the last chunk. (No e-tag were present) Sunucu son yığını onaylamadı. (Mevcut e-etiket bulunamadı) @@ -2359,69 +2364,69 @@ Kullanmanız önerilmez. Dosya adı kodlaması geçerli değil - + Unable to initialize a sync journal. Bir eşitleme günlüğü başlatılamadı. - + Cannot open the sync journal Eşitleme günlüğü açılamıyor - - + + Ignored because of the "choose what to sync" blacklist "Eşitlenecekleri seçin" kara listesinde olduğundan yoksayıldı. - + Not allowed because you don't have permission to add sub-directories in that directory Bu dizine alt dizin ekleme yetkiniz olmadığından izin verilmedi - + Not allowed because you don't have permission to add parent directory Üst dizin ekleme yetkiniz olmadığından izin verilmedi - + Not allowed because you don't have permission to add files in that directory Bu dizine dosya ekleme yetkiniz olmadığından izin verilmedi - + Not allowed to upload this file because it is read-only on the server, restoring Sunucuda salt okunur olduğundan, bu dosya yüklenemedi, geri alınıyor - - + + Not allowed to remove, restoring Kaldırmaya izin verilmedi, geri alınıyor - + Local files and share folder removed. Yerel dosyalar ve paylaşım klasörü kaldırıldı. - + Move not allowed, item restored Taşımaya izin verilmedi, öge geri alındı - + Move not allowed because %1 is read-only %1 salt okunur olduğundan taşımaya izin verilmedi - + the destination hedef - + the source kaynak @@ -2437,21 +2442,35 @@ Kullanmanız önerilmez. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> <p>Sürüm %1. Daha fazla bilgi için lütfen <a href='%2'>%3</a> adresini ziyaret edin.</p> - + <p>Copyright ownCloud, Incorporated</p> <p>Telif Hakkı ownCloud Anonim Şirketi</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> <p>%1 tarafından dağıtılmış ve GNU Genel Kamu Lisansı (GPL) Sürüm 2.0 ile lisanslanmıştır.<br/>%2 ve %2 logoları ABD ve/veya diğer ülkelerde %1 tescili markalarıdır.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + + + + + The downloaded file does not match the checksum, it will be resumed. + + + OCC::ownCloudGui @@ -2724,8 +2743,8 @@ Kullanmanız önerilmez. Hata Etiketi - - + + TextLabel MetinEtiketi @@ -2845,27 +2864,27 @@ Kullanmanız önerilmez. Utility - + %L1 TiB %L1 TiB - + %L1 GiB %L1 GiB - + %L1 MiB %L1 MiB - + %L1 KiB %L1 KiB - + %L1 B %L1 B @@ -2886,7 +2905,7 @@ Kullanmanız önerilmez. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> <p><small> <a href="%1">%2</a> numaralı Git revizyonunundan oluşturuldu %3, %4 Qt kullanılıyor %5, %6</small></p> diff --git a/translations/client_uk.ts b/translations/client_uk.ts index 666cba814..f3f7489dd 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time @@ -81,53 +81,53 @@ Підключено до <server> як <user> - + Add Folder... Додати теку... - + Pause Пауза - + Remove Видалити - + Choose What to Sync Оберіть, що хочете синхронізувати - + Storage Usage Використання сховища - + Retrieving usage information... Отримання інформації по використання... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>Зверніть увагу:</b> Деякі теки, включно з мережевими та віддаленими, можуть мати різні обмеження. - + Account Maintenance Управління обліковим записом - + Edit Ignored Files Ігноровані файли - + Modify Account Редагувати запис @@ -713,22 +713,22 @@ Are you sure you want to perform this operation? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Не отримано E-Tag від серверу, перевірте мережеві налаштування (проксі, шлюз) - + We received a different E-Tag for resuming. Retrying next time. Ми отримали інший E-Tag для відновлення. Спробуйте ще раз пізніше. - + Server returned wrong content-range Сервер повернув невірний content-range - + Connection Timeout Тайм-аут З'єднання @@ -1395,7 +1395,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout Тайм-аут З'єднання @@ -1403,7 +1403,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL Неправильна JSON відповідь на сформований URL @@ -1439,22 +1439,22 @@ It is not advisable to use it. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! Файл %1 не завантажено, через локальний конфлікт ім'я! - + The file could not be downloaded completely. Файл не може бути завантажений повністю. - + File %1 cannot be saved because of a local file name clash! Файл %1 не збережено, через локальний конфлікт ім'я! - + File has changed since discovery @@ -1582,38 +1582,43 @@ It is not advisable to use it. OCC::PropagateUploadFileQNAM - + File Removed Файл переміщено - - + + Local file changed during syncing. It will be resumed. + + + + + Local file changed during sync. Локальний файл змінився під час синхронізації. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. Файл було змінено локально, але він розташований в теці з правами лише на перегляд. Файл відновлено, а ваші зміни розташовані в теці конфліктів. - + Poll URL missing Не вистачає сформованого URL - + The local file was removed during sync. Локальний файл було видалено під час синхронізації. - + The server did not acknowledge the last chunk. (No e-tag were present) Сервер не зміг підтвердити останній відрізок даних. (Були відсутні e-tag) @@ -2361,69 +2366,69 @@ It is not advisable to use it. Кодування файлу не припустиме - + Unable to initialize a sync journal. Не вдалося ініціалізувати протокол синхронізації. - + Cannot open the sync journal Не вдається відкрити протокол синхронізації - - + + Ignored because of the "choose what to sync" blacklist Ігнорується через чорний список в "обрати що синхронізувати" - + Not allowed because you don't have permission to add sub-directories in that directory Не дозволено через відсутність прав на додавання підкаталогів в цій теці. - + Not allowed because you don't have permission to add parent directory Не дозволено через відсутність прав на додавання батьківської теки. - + Not allowed because you don't have permission to add files in that directory Не дозволено через відсутність прав на додавання файлів в цю теку. - + Not allowed to upload this file because it is read-only on the server, restoring Не дозволено завантажувати цей файл, оскільки він має дозвіл лише на перегляд, відновлюємо - - + + Not allowed to remove, restoring Не дозволено видаляти, відновлюємо - + Local files and share folder removed. Локальні файли та теки в загальному доступі було видалено. - + Move not allowed, item restored Переміщення не дозволено, елемент відновлено - + Move not allowed because %1 is read-only Переміщення не дозволено, оскільки %1 помічений тільки для перегляду - + the destination призначення - + the source джерело @@ -2439,21 +2444,35 @@ It is not advisable to use it. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> <p>Версія %1. Для отримання більш детальної інформації, будь ласка, відвідайте <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> <p> Права належать ownCloud, Incorporated </p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> <p>Поширюється через %1 і під ліцензією GNU General Public License (GPL) версії 2.0<br/>%2 логотип %2 є зареєстрованими торговими марками %1 у Сполучених Штатах та інших країнах, або обох.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + + + + + The downloaded file does not match the checksum, it will be resumed. + + + OCC::ownCloudGui @@ -2726,8 +2745,8 @@ It is not advisable to use it. Помилка - - + + TextLabel Мітка @@ -2847,27 +2866,27 @@ It is not advisable to use it. Utility - + %L1 TiB %L1 Тіб - + %L1 GiB %L1 ГіБ - + %L1 MiB %L1 МіБ - + %L1 KiB %L1 КіБ - + %L1 B %L1 Б @@ -2888,7 +2907,7 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index 9f202e92d..cf9bb7160 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -2,9 +2,9 @@ FileSystem - + The destination file has an unexpected size or modification time - + 目标文件有意想不到的大小和修改时间 @@ -81,53 +81,53 @@ <user> 已经连接到 <server> - + Add Folder... 增加文件夹... - + Pause 暂停 - + Remove 移除 - + Choose What to Sync 选择同步内容 - + Storage Usage 存储使用情况 - + Retrieving usage information... 返回使用率信息... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>注释：</b> 一些文件夹，例如网络挂载的和共享的文件夹，可能有不同的限制。 - + Account Maintenance 帐户维护 - + Edit Ignored Files 编辑忽略的文件 - + Modify Account 修改帐户 @@ -661,7 +661,7 @@ Are you sure you want to perform this operation? Authentication failed accessing %1 - + 访问 %1 时认证失败 @@ -713,22 +713,22 @@ Are you sure you want to perform this operation? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway 未能收到来自服务器的 E-Tag，请检查代理/网关 - + We received a different E-Tag for resuming. Retrying next time. 我们收到了不同的恢复 E-Tag，将在下次尝试。 - + Server returned wrong content-range 服务器返回了错误的内容长度 - + Connection Timeout 连接超时 @@ -867,7 +867,7 @@ Checked items will also be deleted if they prevent a directory from being remove &Search: - + &搜索： @@ -1065,7 +1065,7 @@ Checked items will also be deleted if they prevent a directory from being remove New %1 Update Ready - + 新的 %1 更新就绪 @@ -1250,7 +1250,7 @@ It is not advisable to use it. There was an invalid response to an authenticated webdav request - + 对于一个验证的 webdav 请求，有一个无效的响应 @@ -1394,7 +1394,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout 连接超时 @@ -1402,7 +1402,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL 推送 URL 传来的 JSON 无效 @@ -1438,24 +1438,24 @@ It is not advisable to use it. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! 由于本地文件名冲突，文件 %1 无法下载。 - + The file could not be downloaded completely. 文件无法完整下载。 - + File %1 cannot be saved because of a local file name clash! 由于本地文件名冲突，文件 %1 无法保存。 - + File has changed since discovery - + 自从发现文件以来，它已经被改变了 @@ -1463,12 +1463,12 @@ It is not advisable to use it. ; Restoration Failed: %1 - + ；恢复失败：%1 Continue blacklisting: - + 继续黑名单： @@ -1581,38 +1581,43 @@ It is not advisable to use it. OCC::PropagateUploadFileQNAM - + File Removed 已移除文件 - - + + Local file changed during syncing. It will be resumed. + + + + + Local file changed during sync. 本地文件在同步时已修改。 - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. 文件已经在本地修改，但这是某个只读分享的一部分，原文件已经恢复。您的修改已保存在冲突文件中。 - + Poll URL missing 缺少轮询 URL - + The local file was removed during sync. 本地文件在同步时已删除。 - + The server did not acknowledge the last chunk. (No e-tag were present) 服务器找不到上一分块。（找不到 E-tag） @@ -2356,69 +2361,69 @@ It is not advisable to use it. 文件名编码无效 - + Unable to initialize a sync journal. 无法初始化同步日志 - + Cannot open the sync journal 无法打开同步日志 - - + + Ignored because of the "choose what to sync" blacklist 已忽略（“选择同步内容”黑名单） - + Not allowed because you don't have permission to add sub-directories in that directory 你没有权限增加子目录 - + Not allowed because you don't have permission to add parent directory 你没有权限增加父目录 - + Not allowed because you don't have permission to add files in that directory 你没有权限增加文件 - + Not allowed to upload this file because it is read-only on the server, restoring 无法上传文件，因为服务器端此文件为只读，正在回退 - - + + Not allowed to remove, restoring 无法删除，正在回退 - + Local files and share folder removed. 本地文件和共享文件夹已被删除。 - + Move not allowed, item restored - + Move not allowed because %1 is read-only 无法移动，%1为是只读的 - + the destination - + the source @@ -2434,21 +2439,35 @@ It is not advisable to use it. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> <p>版本 %1。详情请见 <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + + + + + The downloaded file does not match the checksum, it will be resumed. + + + OCC::ownCloudGui @@ -2721,8 +2740,8 @@ It is not advisable to use it. 错误标签 - - + + TextLabel 文本标签 @@ -2842,27 +2861,27 @@ It is not advisable to use it. Utility - + %L1 TiB - + %L1 GiB - + %L1 MiB - + %L1 KiB - + %L1 B %L1 B @@ -2883,7 +2902,7 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p> diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index ccf319248..37bdb3bb8 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -2,7 +2,7 @@ FileSystem - + The destination file has an unexpected size or modification time @@ -81,53 +81,53 @@ 以 <user> 的身分連接 <server> - + Add Folder... 新增資料夾… - + Pause 暫停 - + Remove 移除 - + Choose What to Sync 選擇要同步的項目 - + Storage Usage 儲存空間使用狀況 - + Retrieving usage information... 取得使用狀況資訊... - + <b>Note:</b> Some folders, including network mounted or shared folders, might have different limits. <b>注意:</b> 有些資料夾，包括網路掛載或分享資料夾，可能有不同的限制。 - + Account Maintenance 帳號維護 - + Edit Ignored Files 編輯忽略的檔案 - + Modify Account 修改帳號 @@ -710,22 +710,22 @@ Are you sure you want to perform this operation? OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway - + We received a different E-Tag for resuming. Retrying next time. - + Server returned wrong content-range 伺服器回應錯誤的內容長度 - + Connection Timeout 連線逾時 @@ -1389,7 +1389,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout 連線逾時 @@ -1397,7 +1397,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL @@ -1433,22 +1433,22 @@ It is not advisable to use it. OCC::PropagateDownloadFileQNAM - + File %1 can not be downloaded because of a local file name clash! - + The file could not be downloaded completely. 檔案下載無法完成。 - + File %1 cannot be saved because of a local file name clash! - + File has changed since discovery @@ -1576,38 +1576,43 @@ It is not advisable to use it. OCC::PropagateUploadFileQNAM - + File Removed 檔案已移除 - - + + Local file changed during syncing. It will be resumed. + + + + + Local file changed during sync. - + Forcing job abort on HTTP connection reset with Qt < 5.4.2. - + The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file. - + Poll URL missing - + The local file was removed during sync. - + The server did not acknowledge the last chunk. (No e-tag were present) @@ -2347,69 +2352,69 @@ It is not advisable to use it. - + Unable to initialize a sync journal. 同步處理日誌無法初始化 - + Cannot open the sync journal 同步處理日誌無法開啟 - - + + Ignored because of the "choose what to sync" blacklist - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Local files and share folder removed. - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination 目標 - + the source 來源 @@ -2425,21 +2430,35 @@ It is not advisable to use it. OCC::Theme - + <p>Version %1. For more information please visit <a href='%2'>%3</a>.</p> - + <p>Copyright ownCloud, Incorporated</p> - + <p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p> + + OCC::TransmissionChecksumValidator + + + + The checksum header is malformed. + + + + + The downloaded file does not match the checksum, it will be resumed. + + + OCC::ownCloudGui @@ -2712,8 +2731,8 @@ It is not advisable to use it. 錯誤標籤 - - + + TextLabel 文字標籤 @@ -2833,27 +2852,27 @@ It is not advisable to use it. Utility - + %L1 TiB %L1 TiB - + %L1 GiB %L1 GiB - + %L1 MiB %L1 MiB - + %L1 KiB %L1 KiB - + %L1 B %L1 B @@ -2874,7 +2893,7 @@ It is not advisable to use it. ownCloudTheme::about() - + <p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p>