Comparar commits

..

3 Commits

Autor SHA1 Mensagem Data
Piotr M e5e37e4f96 add http2 support 2017-01-16 22:20:21 +01:00
Jenkins for ownCloud 355a644020 [tx-robot] updated from transifex 2017-01-10 02:18:34 +01:00
Jenkins for ownCloud 5e6e4e7464 [tx-robot] updated from transifex 2017-01-08 02:18:35 +01:00
13 arquivos alterados com 36 adições e 33 exclusões
+7 -8
Ver Arquivo
@@ -418,8 +418,10 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
File "${QT_DLL_PATH}\Qt5Core.dll"
File "${QT_DLL_PATH}\Qt5Gui.dll"
File "${QT_DLL_PATH}\Qt5Network.dll"
File "${QT_DLL_PATH}\Qt5OpenGL.dll"
File "${QT_DLL_PATH}\Qt5PrintSupport.dll"
File "${QT_DLL_PATH}\Qt5Qml.dll"
File "${QT_DLL_PATH}\Qt5Quick.dll"
File "${QT_DLL_PATH}\Qt5Sql.dll"
File "${QT_DLL_PATH}\Qt5WebKit.dll"
File "${QT_DLL_PATH}\Qt5WebKitWidgets.dll"
@@ -433,9 +435,9 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
;Qt deps
File "${MING_BIN}\libpng16-16.dll"
File "${MING_BIN}\icudata56.dll"
File "${MING_BIN}\icui18n56.dll"
File "${MING_BIN}\icuuc56.dll"
File "${MING_BIN}\icudata53.dll"
File "${MING_BIN}\icui18n53.dll"
File "${MING_BIN}\icuuc53.dll"
File "${MING_BIN}\libEGL.dll"
File "${MING_BIN}\libGLESv2.dll"
File "${MING_BIN}\libjpeg-8.dll"
@@ -444,14 +446,11 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
File "${MING_BIN}\libcrypto-10.dll"
File "${MING_BIN}\libssl-10.dll"
File "${MING_BIN}\libstdc++-6.dll"
File "${MING_BIN}\libwebp-5.dll"
File "${MING_BIN}\libwebp-4.dll"
File "${MING_BIN}\libxslt-1.dll"
File "${MING_BIN}\libxml2-2.dll"
File "${MING_BIN}\zlib1.dll"
File "${MING_BIN}\libharfbuzz-0.dll"
File "${MING_BIN}\libfreetype-6.dll"
File "${MING_BIN}\libglib-2.0-0.dll"
File "${MING_BIN}\libintl-8.dll"
File "${MING_BIN}\libsqlite3-0.dll"
;QtKeyChain stuff
File "${MING_BIN}\libqt5keychain.dll"
+9
Ver Arquivo
@@ -619,6 +619,12 @@ X-GNOME-Autostart-Delay=3
# Translations
# Translations
# Translations
# Translations
Comment[oc]=@APPLICATION_NAME@ sincronizacion del client
GenericName[oc]=Dorsièr de Sincronizacion
@@ -754,7 +760,10 @@ Comment[th_TH]=@APPLICATION_NAME@ ไคลเอนต์ประสานข
GenericName[th_TH]=ประสานข้อมูลโฟลเดอร์
Name[th_TH]= @APPLICATION_NAME@ ไคลเอนต์ประสานข้อมูลเดสก์ท็อป
Icon[th_TH]=@APPLICATION_EXECUTABLE@
Comment[es_MX]=Cliente de escritorio para sincronziación de @APPLICATION_NAME@
GenericName[es_MX]=Sincronización de Carpetas
Name[es_MX]=Cliente de escritorio para sincronziación de @APPLICATION_NAME@
Icon[es_MX]=@APPLICATION_EXECUTABLE@
Comment[nb_NO]=@APPLICATION_NAME@ skrivebordssynkroniseringsklient
GenericName[nb_NO]=Mappesynkronisering
Name[nb_NO]=@APPLICATION_NAME@ skrivebordssynkroniseringsklient
+4
Ver Arquivo
@@ -204,6 +204,7 @@ QNetworkReply *Account::headRequest(const QUrl &url)
QNetworkRequest request(url);
#if QT_VERSION > QT_VERSION_CHECK(4, 8, 4)
request.setSslConfiguration(this->getOrCreateSslConfig());
request.setAttribute(QNetworkRequest::HTTP2AllowedAttribute, true);
#endif
return _am->head(request);
}
@@ -218,6 +219,7 @@ QNetworkReply *Account::getRequest(const QUrl &url)
QNetworkRequest request(url);
#if QT_VERSION > QT_VERSION_CHECK(4, 8, 4)
request.setSslConfiguration(this->getOrCreateSslConfig());
request.setAttribute(QNetworkRequest::HTTP2AllowedAttribute, true);
#endif
return _am->get(request);
}
@@ -227,6 +229,7 @@ QNetworkReply *Account::deleteRequest( const QUrl &url)
QNetworkRequest request(url);
#if QT_VERSION > QT_VERSION_CHECK(4, 8, 4)
request.setSslConfiguration(this->getOrCreateSslConfig());
request.setAttribute(QNetworkRequest::HTTP2AllowedAttribute, true);
#endif
return _am->deleteResource(request);
}
@@ -241,6 +244,7 @@ QNetworkReply *Account::davRequest(const QByteArray &verb, const QUrl &url, QNet
req.setUrl(url);
#if QT_VERSION > QT_VERSION_CHECK(4, 8, 4)
req.setSslConfiguration(this->getOrCreateSslConfig());
req.setAttribute(QNetworkRequest::HTTP2AllowedAttribute, true);
#endif
return _am->sendCustomRequest(req, verb, data);
}
+2 -11
Ver Arquivo
@@ -74,17 +74,8 @@ OwncloudPropagator::~OwncloudPropagator()
/* The maximum number of active jobs in parallel */
int OwncloudPropagator::maximumActiveJob()
{
static int max = qgetenv("OWNCLOUD_MAX_PARALLEL").toUInt();
if (!max) {
max = 3; //default
}
if (_downloadLimit.fetchAndAddAcquire(0) != 0 || _uploadLimit.fetchAndAddAcquire(0) != 0) {
// disable parallelism when there is a network limit.
return 1;
}
return max;
// this will be parallelised to 100 by hardMaximumActiveJob for files < 100kB
return 50;
}
int OwncloudPropagator::hardMaximumActiveJob()
+1 -1
Ver Arquivo
@@ -1794,7 +1794,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="212"/>
<source>Invalid URL</source>
<translation type="unfinished"/>
<translation>Ungültige URL</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="369"/>
+2 -2
Ver Arquivo
@@ -498,7 +498,7 @@
<message>
<location filename="../src/gui/addcertificatedialog.ui" line="35"/>
<source>Certificate &amp; Key (pkcs12) :</source>
<translation type="unfinished"/>
<translation>Certificate &amp; Key (pkcs12) :</translation>
</message>
<message>
<location filename="../src/gui/addcertificatedialog.ui" line="51"/>
@@ -1795,7 +1795,7 @@ No se recomienda usarla.</translation>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="212"/>
<source>Invalid URL</source>
<translation type="unfinished"/>
<translation>URL inválida.</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="369"/>
+2 -2
Ver Arquivo
@@ -498,7 +498,7 @@
<message>
<location filename="../src/gui/addcertificatedialog.ui" line="35"/>
<source>Certificate &amp; Key (pkcs12) :</source>
<translation type="unfinished"/>
<translation>Certificat et clé (pkcs12)</translation>
</message>
<message>
<location filename="../src/gui/addcertificatedialog.ui" line="51"/>
@@ -1796,7 +1796,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="212"/>
<source>Invalid URL</source>
<translation type="unfinished"/>
<translation>URL invalide</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="369"/>
+2 -2
Ver Arquivo
@@ -498,7 +498,7 @@
<message>
<location filename="../src/gui/addcertificatedialog.ui" line="35"/>
<source>Certificate &amp; Key (pkcs12) :</source>
<translation type="unfinished"/>
<translation>Certificato e chiave (pkcs12):</translation>
</message>
<message>
<location filename="../src/gui/addcertificatedialog.ui" line="51"/>
@@ -1795,7 +1795,7 @@ Non è consigliabile utilizzarlo.</translation>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="212"/>
<source>Invalid URL</source>
<translation type="unfinished"/>
<translation>URL non valido</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="369"/>
+1 -1
Ver Arquivo
@@ -1801,7 +1801,7 @@ We adviseren deze site niet te gebruiken.</translation>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="212"/>
<source>Invalid URL</source>
<translation type="unfinished"/>
<translation>Ongeldige URL</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="369"/>
+1 -1
Ver Arquivo
@@ -1795,7 +1795,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="212"/>
<source>Invalid URL</source>
<translation type="unfinished"/>
<translation>URL inválida</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="369"/>
+2 -2
Ver Arquivo
@@ -498,7 +498,7 @@
<message>
<location filename="../src/gui/addcertificatedialog.ui" line="35"/>
<source>Certificate &amp; Key (pkcs12) :</source>
<translation type="unfinished"/>
<translation>Сертификат и ключ (pkcs12)</translation>
</message>
<message>
<location filename="../src/gui/addcertificatedialog.ui" line="51"/>
@@ -1793,7 +1793,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="212"/>
<source>Invalid URL</source>
<translation type="unfinished"/>
<translation>Неверная ссылка</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="369"/>
+1 -1
Ver Arquivo
@@ -1796,7 +1796,7 @@ Uporaba ni priporočljiva.</translation>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="212"/>
<source>Invalid URL</source>
<translation type="unfinished"/>
<translation>Neveljaven naslov URL</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="369"/>
+2 -2
Ver Arquivo
@@ -498,7 +498,7 @@
<message>
<location filename="../src/gui/addcertificatedialog.ui" line="35"/>
<source>Certificate &amp; Key (pkcs12) :</source>
<translation type="unfinished"/>
<translation> (pkcs12) :</translation>
</message>
<message>
<location filename="../src/gui/addcertificatedialog.ui" line="51"/>
@@ -1796,7 +1796,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="212"/>
<source>Invalid URL</source>
<translation type="unfinished"/>
<translation>URL </translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="369"/>