[Pkg-owncloud-commits] [owncloud-client] 11/70: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sat May 17 20:01:25 UTC 2014
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 6e48eb939709b0c77cd7f1e6aed5c2fbc0601517
Author: Jenkins for ownCloud <owncloud-bot at tmit.eu>
Date: Thu May 1 01:26:48 2014 -0400
[tx-robot] updated from transifex
---
translations/mirall_ca.ts | 35 +++++++++++++++-------
translations/mirall_cs.ts | 35 +++++++++++++++-------
translations/mirall_de.ts | 35 +++++++++++++++-------
translations/mirall_el.ts | 35 +++++++++++++++-------
translations/mirall_en.ts | 35 +++++++++++++++-------
translations/mirall_es.ts | 35 +++++++++++++++-------
translations/mirall_es_AR.ts | 35 +++++++++++++++-------
translations/mirall_et.ts | 35 +++++++++++++++-------
translations/mirall_eu.ts | 35 +++++++++++++++-------
translations/mirall_fa.ts | 35 +++++++++++++++-------
translations/mirall_fi.ts | 41 ++++++++++++++++---------
translations/mirall_fr.ts | 35 +++++++++++++++-------
translations/mirall_gl.ts | 35 +++++++++++++++-------
translations/mirall_hu.ts | 35 +++++++++++++++-------
translations/mirall_it.ts | 35 +++++++++++++++-------
translations/mirall_ja.ts | 71 ++++++++++++++++++++++++++------------------
translations/mirall_nl.ts | 35 +++++++++++++++-------
translations/mirall_pl.ts | 35 +++++++++++++++-------
translations/mirall_pt.ts | 35 +++++++++++++++-------
translations/mirall_pt_BR.ts | 35 +++++++++++++++-------
translations/mirall_ru.ts | 35 +++++++++++++++-------
translations/mirall_sk.ts | 35 +++++++++++++++-------
translations/mirall_sl.ts | 35 +++++++++++++++-------
translations/mirall_sv.ts | 35 +++++++++++++++-------
translations/mirall_th.ts | 35 +++++++++++++++-------
translations/mirall_tr.ts | 35 +++++++++++++++-------
translations/mirall_uk.ts | 35 +++++++++++++++-------
translations/mirall_zh_CN.ts | 35 +++++++++++++++-------
translations/mirall_zh_TW.ts | 35 +++++++++++++++-------
29 files changed, 717 insertions(+), 340 deletions(-)
diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts
index 5ac0db5..961d644 100644
--- a/translations/mirall_ca.ts
+++ b/translations/mirall_ca.ts
@@ -156,17 +156,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>La connexió %1 no està configurada.</translation>
</message>
@@ -186,7 +186,7 @@
<translation>S'està sincronitzant.<br/>Voleu parar-la?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Connectat a <a href="%1">%2</a>.</translation>
</message>
@@ -196,12 +196,12 @@
<translation>%1 de %2, fitxer %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Connectat a <a href="%1">%2</a> com a <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualment no hi ha informació disponible de l'ús d'emmagatzemament.</translation>
</message>
@@ -596,15 +596,20 @@ Esteu segur que voleu executar aquesta operació?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1238,6 +1243,14 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1327,17 +1340,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation>El fitxer local ha canviat durant la sincronització.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts
index 34c0824..0a29375 100644
--- a/translations/mirall_cs.ts
+++ b/translations/mirall_cs.ts
@@ -156,17 +156,17 @@
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) z %2 místa na disku použito.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Žádné spojení s %1 na <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>Žádné spojení s %1 nenastaveno.</translation>
</message>
@@ -186,7 +186,7 @@
<translation>Operace synchronizace právě probíhá.<br/>Přejete si ji ukončit?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Připojeno k <a href="%1">%2</a>.</translation>
</message>
@@ -196,12 +196,12 @@
<translation>%1 z %2, soubor %3 z %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Připojeno k <a href="%1">%2</a> jako <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation>Momentálně nejsou k dispozici žádné informace o využití úložiště</translation>
</message>
@@ -596,15 +596,20 @@ Opravdu chcete provést tuto akci?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ze serveru nebyl obdržen E-Tag, zkontrolujte proxy/bránu</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Obdrželi jsme jiný E-Tag pro pokračování. Zkusím znovu příště.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1240,6 +1245,14 @@ Nedoporučuje se jí používat.</translation>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1329,17 +1342,17 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>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.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation>Místní soubor byl změněn během synchronizace.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Server nepotvrdil poslední část dat. (Nebyl nalezen e-tag)</translation>
</message>
diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts
index f4d0e15..1b6fcc1 100644
--- a/translations/mirall_de.ts
+++ b/translations/mirall_de.ts
@@ -157,17 +157,17 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) von %2 Serverkapazität in Benutzung.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Keine Verbindung mit %1 zu <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>Keine %1-Verbindung konfiguriert.</translation>
</message>
@@ -187,7 +187,7 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>Die Synchronistation läuft gerade.<br/>Wollen Sie diese beenden?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Verbunden mit <a href="%1">%2</a>.</translation>
</message>
@@ -197,12 +197,12 @@ Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entf
<translation>%1 of %2, Datei %3 von %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Verbunden mit <a href="%1">%2</a> als <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation>Derzeit sind keine Speichernutzungsinformationen verfügbar.</translation>
</message>
@@ -597,15 +597,20 @@ Sind Sie sicher, dass sie diese Operation durchführen wollen?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Kein E-Tag vom Server empfangen, bitte Proxy / Gateway überprüfen</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Es wurde ein unterschiedlicher E-Tag zum Fortfahren empfangen. Bitte beim nächsten mal nochmal versuchen.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1241,6 +1246,14 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1330,17 +1343,17 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Die Datei wurde von einer Nur-Lese-Freigabe lokal bearbeitet. Die Datei wurde wiederhergestellt und Ihre Bearbeitung ist in der Konflikte-Datei.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Der Server hat den letzten Block nicht bestätigt. (Der E-Tag war nicht vorhanden)</translation>
</message>
diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts
index f7e0c93..843228b 100644
--- a/translations/mirall_el.ts
+++ b/translations/mirall_el.ts
@@ -156,17 +156,17 @@
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>Χρησιμοποιούμενος χώρος στον διακομιστή: %1 (%3%) από %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Δεν υπάρχει σύνδεση με %1 στο <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>Δεν υπάρχει σύνδεση με το %1.</translation>
</message>
@@ -186,7 +186,7 @@
<translation>Η λειτουργία συγχρονισμού λειτουργεί.<br/> Θέλετε να την τερματίσετε;</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Συνδεδεμένοι με <a href="%1">%2</a>.</translation>
</message>
@@ -196,12 +196,12 @@
<translation>%1 από %2, αρχείο %3 από %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Συνδεδεμένοι με <a href="%1">%2</a> ως <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation>Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες.</translation>
</message>
@@ -596,15 +596,20 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Δεν ελήφθη E-Tag από τον διακομιστή, ελέγξτε τον διακομιστή μεσολάβησης/πύλη</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Ελήφθη διαφορετικό E-Tag για συνέχιση. Επανάληψη την επόμενη φορά.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1240,6 +1245,14 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1329,17 +1342,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Το αρχείο υπέστη επεξεργασία τοπικά αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Επαναφέρθηκε και η επεξεργασία σας βρίσκεται στο αρχείο συγκρούσεων.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Ο διακομιστής δεν επιβεβαίωσε το τελευταίο τμήμα. (Δεν υπήρχε E-Tag)</translation>
</message>
diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts
index 493bfbb..4003d80 100644
--- a/translations/mirall_en.ts
+++ b/translations/mirall_en.ts
@@ -158,17 +158,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"></translation>
</message>
@@ -188,7 +188,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"></translation>
</message>
@@ -198,12 +198,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"></translation>
</message>
@@ -595,15 +595,20 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1235,6 +1240,14 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1324,17 +1337,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts
index 6521938..7ce4dda 100644
--- a/translations/mirall_es.ts
+++ b/translations/mirall_es.ts
@@ -156,17 +156,17 @@
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) de %2 espacio usado en el servidor.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>No hay conexión a %1 en <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>No hay ninguna conexión de %1 configurada.</translation>
</message>
@@ -186,7 +186,7 @@
<translation>La sincronización está en curso.<br/>¿Desea interrumpirla?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado a <a href="%1">%2</a>.</translation>
</message>
@@ -196,12 +196,12 @@
<translation>%1 de %2, archivo %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible sobre el uso de almacenamiento.</translation>
</message>
@@ -596,15 +596,20 @@ Está seguro de que desea realizar esta operación?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>No se recibió ninguna e-tag del servidor, revisar el proxy/gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Se recibió una e-tag distinta para reanudar. Se intentará nuevamente.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1240,6 +1245,14 @@ No se recomienda usarlo.</translation>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1329,17 +1342,17 @@ No se recomienda usarlo.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>El archivo fue modificado localmente, pero es parte de una carpeta compartida en modo de solo lectura. Ha sido recuperado y tu modificación está en el archivo de conflicto.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation>Un archivo local fue modificado durante la sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>El servidor no reconoció la última parte. (No había una e-tag presente.)</translation>
</message>
diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts
index ea2cf17..87104c8 100644
--- a/translations/mirall_es_AR.ts
+++ b/translations/mirall_es_AR.ts
@@ -156,17 +156,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>No hay ninguna conexión de %1 configurada.</translation>
</message>
@@ -186,7 +186,7 @@
<translation>La sincronización está en curso.<br/>¿Querés interrumpirla?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado a <a href="%1">%2</a>.</translation>
</message>
@@ -196,12 +196,12 @@
<translation>%1 de %2, archivo %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible acerca del uso del almacenamiento.</translation>
</message>
@@ -596,15 +596,20 @@ Esto se puede deber a que el directorio fue reconfigurado de manera silenciosa o
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1238,6 +1243,14 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1327,17 +1340,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts
index a772ca0..136b3bb 100644
--- a/translations/mirall_et.ts
+++ b/translations/mirall_et.ts
@@ -156,17 +156,17 @@
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) %2-st serveri mahust on kasutuses.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Ühendus puudub %1 <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>Ühtegi %1 ühendust pole seadistatud.</translation>
</message>
@@ -186,7 +186,7 @@
<translation>Sünkroniseerimine on käimas.<br/>Kas sa soovid seda lõpetada?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Ühendatud <a href="%1">%2</a>.</translation>
</message>
@@ -196,12 +196,12 @@
<translation>%1 / %2, fail %3 / %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Ühendatud <a href="%1">%2</a> kui <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation>Hetkel pole mahu kasutuse info saadaval.</translation>
</message>
@@ -596,15 +596,20 @@ Oled kindel, et soovid seda operatsiooni teostada?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ühtegi E-Silti ei saabunud serverist, kontrolli puhverserverit/lüüsi.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Saime jätkamiseks erineva E-Sildi. Proovin järgmine kord uuesti.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1240,6 +1245,14 @@ Selle kasutamine pole soovitatav.</translation>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1329,17 +1342,17 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Faili on lokaalselt muudetud, kuid see on osa kirjutamisõiguseta jagamisest. See on taastatud ning sinu muudatus on konfliktses failis.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation>Kohalik fail muutus sünkroniseeringu käigus.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Server ei tunnistanud viimast tükki. (E-silt puudus).</translation>
</message>
diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts
index e343f0f..2982341 100644
--- a/translations/mirall_eu.ts
+++ b/translations/mirall_eu.ts
@@ -156,17 +156,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>Ez dago %1 konexiorik konfiguratuta.</translation>
</message>
@@ -186,7 +186,7 @@
<translation>Sinkronizazio martxan da.<br/>Bukatu nahi al duzu?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation><a href="%1">%2</a>ra konektatuta.</translation>
</message>
@@ -196,12 +196,12 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation> <a href="%1">%2</a>ra konektatuta <i>%3</i> erabiltzailearekin.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation>Orain ez dago eskuragarri biltegiratze erabileraren informazioa.</translation>
</message>
@@ -593,15 +593,20 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ez da E-Tagik jaso zerbitzaritik, egiaztatu Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1235,6 +1240,14 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1324,17 +1337,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts
index 9254b5e..b8f4d13 100644
--- a/translations/mirall_fa.ts
+++ b/translations/mirall_fa.ts
@@ -156,17 +156,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"/>
</message>
@@ -186,7 +186,7 @@
<translation>عملیات همگام سازی در حال اجراست.<br/>آیا دوست دارید آن را متوقف کنید؟</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
@@ -196,12 +196,12 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -593,15 +593,20 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1233,6 +1238,14 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1322,17 +1335,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts
index e12b5fb..b0faf8a 100644
--- a/translations/mirall_fi.ts
+++ b/translations/mirall_fi.ts
@@ -156,17 +156,17 @@
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) / %2 palvelimen tilasta käytössä.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>%1-yhteyttä ei ole määritelty.</translation>
</message>
@@ -186,7 +186,7 @@
<translation>Synkronointioperaatio on meneillään.<br/>Haluatko keskeyttää sen?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Muodosta yhteys - <a href="%1">%2</a>.</translation>
</message>
@@ -196,14 +196,14 @@
<translation>%1/%2, tiedosto %3/%4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
- <translation type="unfinished"/>
+ <translation>Tallennustilan käyttötietoja ei ole juuri nyt saatavilla.</translation>
</message>
</context>
<context>
@@ -249,7 +249,7 @@
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="127"/>
<source>Unable to connect to %1</source>
- <translation type="unfinished"/>
+ <translation>Yhteys %1iin epäonnistui</translation>
</message>
<message>
<location filename="../src/mirall/connectionvalidator.cpp" line="157"/>
@@ -593,15 +593,20 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -839,7 +844,7 @@ Checked items will also be deleted if they prevent a directory from being remove
<message>
<location filename="../src/mirall/networksettings.ui" line="52"/>
<source>Specify proxy manually as</source>
- <translation type="unfinished"/>
+ <translation>Määritä välityspalvelin käsin</translation>
</message>
<message>
<location filename="../src/mirall/networksettings.ui" line="80"/>
@@ -1235,6 +1240,14 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1324,17 +1337,17 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts
index c67a48c..3b70cee 100644
--- a/translations/mirall_fr.ts
+++ b/translations/mirall_fr.ts
@@ -156,17 +156,17 @@
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) de %2 d'espace utilisé sur le serveur.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Aucune connexion à %1 à <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>Aucune connexion à %1 configurée</translation>
</message>
@@ -186,7 +186,7 @@
<translation>La synchronisation est en cours.<br/>Voulez-vous y mettre un terme?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Connecté à <a href="%1">%2</a>.</translation>
</message>
@@ -196,12 +196,12 @@
<translation>%1 de %2, fichier %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Connecté à <a href="%1">%2</a> en tant que <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actuellement aucune information d'utilisation de stockage n'est disponible.</translation>
</message>
@@ -596,15 +596,20 @@ Voulez-vous réellement effectuer cette opération ?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Aucun E-Tag reçu du serveur, vérifiez le proxy / la passerelle</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Nous avons reçu un E-Tag différent pour reprendre le téléchargement. Nouvel essai la prochaine fois.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1240,6 +1245,14 @@ Il est déconseillé de l'utiliser.</translation>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1329,17 +1342,17 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>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 confit.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation>Fichier local modifié pendant la synchronisation.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Le serveur n'a pas acquitté le dernier morceau (aucun e-tag n'était présent).</translation>
</message>
diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts
index 00eaa6d..0c8e58a 100644
--- a/translations/mirall_gl.ts
+++ b/translations/mirall_gl.ts
@@ -156,17 +156,17 @@
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation> Espazo usado do servidor %1 (%3%) de %2.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Sen conexión con %1 en <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>Non se configurou a conexión %1.</translation>
</message>
@@ -186,7 +186,7 @@
<translation>Estase realizando a sincronización.<br/>Quere interrompela e rematala?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado a <a href="%1">%2</a>.</translation>
</message>
@@ -196,12 +196,12 @@
<translation>%1 de %2, ficheiro %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente non hai dispoñíbel ningunha información sobre o uso do almacenamento.</translation>
</message>
@@ -596,15 +596,20 @@ Confirma que quere realizar esta operación?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Non se recibiu a «E-Tag» do servidor, comprobe o proxy e/ou a pasarela</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recibiuse unha «E-Tag» diferente para continuar. Tentándoo outra vez.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1240,6 +1245,14 @@ Recomendámoslle que non o use.</translation>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1329,17 +1342,17 @@ Recomendámoslle que non o use.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>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.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation>O ficheiro local cambiou durante a sincronización.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>O servidor non recoñeceu o último fragmento. (Non hai e-tag presentes)</translation>
</message>
diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts
index 3584da2..781ff25 100644
--- a/translations/mirall_hu.ts
+++ b/translations/mirall_hu.ts
@@ -156,17 +156,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"/>
</message>
@@ -186,7 +186,7 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
@@ -196,12 +196,12 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -593,15 +593,20 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1233,6 +1238,14 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1322,17 +1335,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts
index 87060b1..1b233d1 100644
--- a/translations/mirall_it.ts
+++ b/translations/mirall_it.ts
@@ -156,17 +156,17 @@
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) di %2 spazio in uso sul server.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Nessuna connessione a %1 su <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>Nessuna connessione di %1 configurata.</translation>
</message>
@@ -186,7 +186,7 @@
<translation>L'operazione di sincronizzazione è in corso.<br/>Vuoi terminarla?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Connesso a <a href="%1">%2</a>.</translation>
</message>
@@ -196,12 +196,12 @@
<translation>%1 di %2, file %3 di %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Connesso a <a href="%1">%2</a> come <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation>Non ci sono informazioni disponibili sull'utilizzo dello spazio di archiviazione.</translation>
</message>
@@ -596,15 +596,20 @@ Sei sicuro di voler eseguire questa operazione?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nessun e-tag ricevuto dal server, controlla il proxy/gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Abbiamo ricevuto un e-tag diverso per il recupero. Riprova più tardi.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1239,6 +1244,14 @@ Non è consigliabile utilizzarlo.</translation>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1328,17 +1341,17 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Il file è stato modificato localmente, ma è parte di una condivisione in sola lettura. È stato ripristinato e la tua modifica è nel file di conflitto.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation>Un file locale è cambiato durante la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Il server non ha riconosciuto l'ultimo pezzo. (Nessun e-tag era presente)</translation>
</message>
diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts
index fa6bc15..4456fad 100644
--- a/translations/mirall_ja.ts
+++ b/translations/mirall_ja.ts
@@ -147,26 +147,26 @@
<location filename="../src/mirall/accountsettings.cpp" line="619"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (1MB of 2MB)"</extracomment>
- <translation type="unfinished"/>
+ <translation>%1 %2 (%4 中 %3 完了)</translation>
</message>
<message>
<location filename="../src/mirall/accountsettings.cpp" line="622"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
- <translation type="unfinished"/>
+ <translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) / %2 使用中のサーバー領域</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation><a href="%2">%3</a> に %1 への接続がありません。</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>%1 の接続は設定されていません。</translation>
</message>
@@ -186,7 +186,7 @@
<translation>同期作業を実行中です。<br/>終了しますか？</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation><a href="%1">%2</a> へ接続しました。</translation>
</message>
@@ -196,12 +196,12 @@
<translation>%1 of %2, ファイル数 %3 of %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation> <a href="%1">%2</a> に <i>%3</i> として接続</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation>現在、利用できるストレージ利用状況はありません。</translation>
</message>
@@ -597,15 +597,20 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>サーバーからE-Tagを受信できません。プロキシ/ゲートウェイを確認してください。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>同期再開時に違う E-Tagを受信しました。次回リトライします。</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1199,7 +1204,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudsetupwizard.cpp" line="358"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
- <translation type="unfinished"/>
+ <translation>このフォルダまたはその中のファイルが他のプログラムで開かれているため、このフォルダの削除やバックアップができません。このフォルダやファイルを閉じてから再試行するか、このセットアップをキャンセルしてください。</translation>
</message>
</context>
<context>
@@ -1239,6 +1244,14 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1328,17 +1341,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>ファイルがローカルで編集されましたが、読み込み専用の共有の一部です。ファイルは復元され、あなたの編集は競合するファイル内にあります。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation>ローカルのファイルが同期中に変更されました。</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>サーバーは最終チャンクを認識しませんでした。（e-tag が存在しませんでした）</translation>
</message>
@@ -1494,12 +1507,12 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/creds/shibbolethcredentials.cpp" line="299"/>
<source>Login Error</source>
- <translation type="unfinished"/>
+ <translation>ログインエラー</translation>
</message>
<message>
<location filename="../src/creds/shibbolethcredentials.cpp" line="299"/>
<source>You must sign in as user %1</source>
- <translation type="unfinished"/>
+ <translation>ユーザ %1 としてログインする必要があります</translation>
</message>
</context>
<context>
@@ -1590,7 +1603,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="123"/>
<source>SHA-256:</source>
- <translation type="unfinished"/>
+ <translation>SHA-256:</translation>
</message>
<message>
<location filename="../src/mirall/sslbutton.cpp" line="125"/>
@@ -1862,12 +1875,12 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/syncengine.cpp" line="182"/>
<source>An internal error number %1 happened.</source>
- <translation type="unfinished"/>
+ <translation>内部エラー番号 %1 が発生しました。</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="240"/>
<source>The item is not synced because of previous errors: %1</source>
- <translation type="unfinished"/>
+ <translation>このアイテムは、以前にエラーが発生していたため同期させません: %1</translation>
</message>
<message>
<location filename="../src/mirall/syncengine.cpp" line="274"/>
@@ -1892,7 +1905,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/syncengine.cpp" line="550"/>
<source>Cannot open the sync journal</source>
- <translation type="unfinished"/>
+ <translation>同期ジャーナルを開くことができません</translation>
</message>
</context>
<context>
@@ -1921,7 +1934,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="179"/>
<source>Disconnected from server</source>
- <translation type="unfinished"/>
+ <translation>サーバと切断しました</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="211"/>
@@ -2021,7 +2034,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="411"/>
<source>Syncing %1 of %2 (%3 of %4)</source>
- <translation type="unfinished"/>
+ <translation>%2 中の %1 を同期しています ( %4 中 %3 完了)</translation>
</message>
<message>
<location filename="../src/mirall/owncloudgui.cpp" line="426"/>
@@ -2285,7 +2298,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="51"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5.</small></p></source>
- <translation type="unfinished"/>
+ <translation><p><small><a href="%1">%2</a> %3, %4 のGitリビジョンからのビルド Qt %5 を利用</small><p></translation>
</message>
<message>
<location filename="../src/mirall/owncloudtheme.cpp" line="58"/>
@@ -2318,12 +2331,12 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="42"/>
<source>Ignored</source>
- <translation type="unfinished"/>
+ <translation>無視しました</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="44"/>
<source>Filesystem access error</source>
- <translation type="unfinished"/>
+ <translation>ファイルシステムのアクセスエラー</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="46"/>
@@ -2349,17 +2362,17 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="66"/>
<source>deleting</source>
- <translation type="unfinished"/>
+ <translation>削除しています</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="69"/>
<source>moving</source>
- <translation type="unfinished"/>
+ <translation>移動しています</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="71"/>
<source>ignoring</source>
- <translation type="unfinished"/>
+ <translation>無視しています</translation>
</message>
<message>
<location filename="../src/mirall/progressdispatcher.cpp" line="73"/>
@@ -2371,7 +2384,7 @@ It is not advisable to use it.</source>
<location filename="../src/mirall/progressdispatcher.cpp" line="78"/>
<location filename="../src/mirall/progressdispatcher.cpp" line="80"/>
<source>unknown</source>
- <translation type="unfinished"/>
+ <translation>不明</translation>
</message>
</context>
<context>
diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts
index c22930f..4ff62cf 100644
--- a/translations/mirall_nl.ts
+++ b/translations/mirall_nl.ts
@@ -156,17 +156,17 @@
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) van %2 serverruimte in gebruik.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Geen verbinding naar %1 op <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>Geen %1 connectie geconfigureerd.</translation>
</message>
@@ -186,7 +186,7 @@
<translation>Bezig met synchroniseren.<br/>Wil je stoppen met synchroniseren?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Verbonden met <a href="%1">%2</a>.</translation>
</message>
@@ -196,12 +196,12 @@
<translation>%1 van %2, bestand %3 van %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Verbonden met <a href="%1">%2</a> als <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation>Er is nu geen informatie over het gebruik van de opslagruimte beschikbaar.</translation>
</message>
@@ -596,15 +596,20 @@ Weet u zeker dat u deze bewerking wilt uitvoeren?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Geen E-Tag ontvangen van de server, controleer Proxy/Gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>We ontvingen een afwijkende E-Tag om door te gaan. We proberen het later opnieuw.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1240,6 +1245,14 @@ We adviseren deze site niet te gebruiken.</translation>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1329,17 +1342,17 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>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.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation>Lokaal bestand gewijzigd bij sync.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>De server heeft het laatste deel niet bevestigd (er was geen e-tag aanwezig)</translation>
</message>
diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts
index de2b34f..ec853b1 100644
--- a/translations/mirall_pl.ts
+++ b/translations/mirall_pl.ts
@@ -156,17 +156,17 @@
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) z %2 przestrzeni na serwerze w użyciu.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Brak połączenia do %1 na <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>Połączenie %1 nie skonfigurowane.</translation>
</message>
@@ -186,7 +186,7 @@
<translation>Operacja synchronizacji jest uruchomiona.<br>Czy chcesz ją zakończyć?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Podłączony do <a href="%1">%2</a>.</translation>
</message>
@@ -196,12 +196,12 @@
<translation>%1 z %2, plik %3 z %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Podłączony do <a href="%1">%2</a> jako <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation>Obecnie nie ma dostępnych informacji o wykorzystaniu pamięci masowej.</translation>
</message>
@@ -596,15 +596,20 @@ Czy jesteś pewien/pewna, że chcesz wykonać tę operację?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nie otrzymano E-Tag z serwera, sprawdź Proxy/Bramę</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Otrzymaliśmy inny E-Tag wznowienia. Spróbuje ponownie następnym razem.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1240,6 +1245,14 @@ Niezalecane jest jego użycie.</translation>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1329,17 +1342,17 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>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</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation>Lokalny plik zmienił się podczas synchronizacji.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Serwer nie potwierdził ostatniego łańcucha danych. (Nie było żadnego e-tag-u)</translation>
</message>
diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts
index 93de37e..0a11337 100644
--- a/translations/mirall_pt.ts
+++ b/translations/mirall_pt.ts
@@ -156,17 +156,17 @@
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) de %2 de espaço utilizado.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Sem ligação a %1 em <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>%1 sem ligação configurada.</translation>
</message>
@@ -186,7 +186,7 @@
<translation>A operação de sincronização está a ser executada.<br/>Deseja terminar?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado a <a href="%1">%2</a>.</translation>
</message>
@@ -196,12 +196,12 @@
<translation>%1 de %2, ficheiro %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation>Histórico de utilização de armazenamento não disponível.</translation>
</message>
@@ -595,15 +595,20 @@ Se você, ou o seu administrador, reiniciou a sua conta no servidor, escolha &q
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1237,6 +1242,14 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1326,17 +1339,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation>Ficheiro local alterado durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts
index 53838e0..1df0884 100644
--- a/translations/mirall_pt_BR.ts
+++ b/translations/mirall_pt_BR.ts
@@ -156,17 +156,17 @@
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) de %2 do espaço em uso no servidor.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Nenhuma conexão para %1 em <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>Sem %1 conexão configurada.</translation>
</message>
@@ -186,7 +186,7 @@
<translation>A operação de sincronização está acontecendo.<br/>deseja finaliza-la?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Conectado à <a href="%1">%2</a>.</translation>
</message>
@@ -196,12 +196,12 @@
<translation>%1 of %2, file %3 de %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Conectado a <a href="%1">%2</a> como <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation>Atualmente, não há informações de uso de armazenamento disponível.</translation>
</message>
@@ -596,15 +596,20 @@ Você tem certeza que quer executar esta operação?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nenhuma E-Tag recebida do servidor, verifique Proxy / gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Recebemos um e-Tag diferente para resumir. Tente uma próxima vez.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1238,6 +1243,14 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1327,17 +1340,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>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.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation>Arquivo local modificado durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>O servidor não reconheceu o último pedaço. (Nenhuma e-etiqueta estava presente)</translation>
</message>
diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts
index 56e9b2d..a408577 100644
--- a/translations/mirall_ru.ts
+++ b/translations/mirall_ru.ts
@@ -156,17 +156,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>Нет настроенного подключения %1.</translation>
</message>
@@ -186,7 +186,7 @@
<translation>Синхронизация запущена.<br/>Вы хотите, остановить ее?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Соединились с <a href="%1">%2</a>.</translation>
</message>
@@ -196,12 +196,12 @@
<translation>%1 из %2, файл %3 из %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Подключён к <a href="%1">%2</a> как <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation>В данный момент информация о заполненности хранилища недоступна.</translation>
</message>
@@ -596,15 +596,20 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation> E-Tag от сервера на получен, проверьте сетевые настройки (настройки прокси, шлюз).</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Мы получили другой E-Tag для возобновления. Повторите попытку позже.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1240,6 +1245,14 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1329,17 +1342,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts
index 77ae5d9..6373df9 100644
--- a/translations/mirall_sk.ts
+++ b/translations/mirall_sk.ts
@@ -156,17 +156,17 @@
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) z %2 miesta na disku je použité. </translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Žiadne spojenie s %1 na <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>Žiadne nakonfigurované %1 spojenie</translation>
</message>
@@ -186,7 +186,7 @@
<translation>Proces synchronizácie práve prebieha.<br/>Chcete ho ukončiť?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Pripojené k <a href="%1">%2</a>.</translation>
</message>
@@ -196,12 +196,12 @@
<translation>%1 z %2, súbor %3 z %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Pripojené k <a href="%1">%2</a> ako <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation>Teraz nie sú k dispozícii žiadne informácie o využití úložiska.</translation>
</message>
@@ -596,15 +596,20 @@ Ste si istý, že chcete uskutočniť danú operáciu?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Zo servera nebol prijatý E-Tag, skontrolujte proxy/bránu</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Prijali sme iný E-Tag pre pokračovanie. Skúsim to neskôr znovu.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1240,6 +1245,14 @@ Nie je vhodné ju používať.</translation>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1329,17 +1342,17 @@ Nie je vhodné ju používať.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>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.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation>Lokálny súbor bol zmenený počas synchronizácie.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Server nepotvrdil poslednú časť dát. (Nebol nájdený e-tag)</translation>
</message>
diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts
index bbf91f0..f494dad 100644
--- a/translations/mirall_sl.ts
+++ b/translations/mirall_sl.ts
@@ -156,17 +156,17 @@
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) od %2 prostora strežnika je v uporabi.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Ni povezave z %1 pri <a href="%2">%3</a>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>Ni nastavljenih %1 povezav.</translation>
</message>
@@ -186,7 +186,7 @@
<translation>Izvaja se usklajevanje.<br/>Ali želite opravilo prekiniti?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Vzpostavljena je povezava s strežnikom <a href="%1">%2</a>.</translation>
</message>
@@ -196,12 +196,12 @@
<translation>%1 od %2, datoteka %3 od %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Vzpostavljena je povezava z <a href="%1">%2</a> kot <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation>Trenutno ni na voljo nobenih podatkov o porabi prostora.</translation>
</message>
@@ -596,15 +596,20 @@ Ali sta prepričani, da želite izvesti to opravilo?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ni prejete oznake s strežnika. Preveriti je treba podatke posredovalnega strežnika ali prehoda.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Prejeta je različna oznaka za nadaljevanje opravila. Ponovni poskus bo izveden kasneje.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1240,6 +1245,14 @@ Uporaba ni priporočljiva.</translation>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1329,17 +1342,17 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>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.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation>Krajevna datoteka je bila med usklajevanjem spremenjena.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Ni prejetega odziva s strežnnika s potrdilom o prejemu zadnjega dela datoteke (ni prejete oznake).</translation>
</message>
diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts
index ec51b2d..2975e3c 100644
--- a/translations/mirall_sv.ts
+++ b/translations/mirall_sv.ts
@@ -156,17 +156,17 @@
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>%1 (%3%) av %2 server utrymme används.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation>Ingen anslutning till %1 vid <a href="%2">%3</a></translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>Ingen %1 anslutning konfigurerad.</translation>
</message>
@@ -186,7 +186,7 @@
<translation>En synkronisering pågår.<br/>Vill du avbryta den?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation>Ansluten till <a href="%1">%2</a>.</translation>
</message>
@@ -196,12 +196,12 @@
<translation>%1 av %2, fil %3 av %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation>Ansluten till <a href="%1">%2</a> as <i>%3</i>.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation>Just nu finns ingen utrymmes information tillgänglig</translation>
</message>
@@ -596,15 +596,20 @@ Detta kan bero på att konfigurationen för mappen ändrats, eller att alla file
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Ingen e-tag mottogs från servern, kontrollera proxy/gateway</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Vi mottog en helt annan e-tag för att återuppta. Försök igen nästa gång.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1240,6 +1245,14 @@ Det är inte lämpligt använda den.</translation>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1329,17 +1342,17 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Filen ändrades lokalt men är en del av en endast-läsbar delning. Den återställdes och din editering är i konflikt filen.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation>Lokal fil ändrades under synk.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Servern erkände inte den sista biten. (Ingen e-tag var närvarande)</translation>
</message>
diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts
index 83e0523..31e5163 100644
--- a/translations/mirall_th.ts
+++ b/translations/mirall_th.ts
@@ -156,17 +156,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>ยังไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า</translation>
</message>
@@ -186,7 +186,7 @@
<translation>การดำเนินการเพื่อถ่ายโอนข้อมูลกำลังทำงานอยู่ <br/>คุณต้องการสิ้นสุดการทำงานหรือไม่?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
@@ -196,12 +196,12 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -593,15 +593,20 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1233,6 +1238,14 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1322,17 +1335,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts
index 5036001..22047d1 100644
--- a/translations/mirall_tr.ts
+++ b/translations/mirall_tr.ts
@@ -156,17 +156,17 @@
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation>Sunucudaki %2'lık kotanın %1'ı (%%3) kullanılıyor.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation><a href="%2">%3</a> üzerinde %1 bağlantısı yok.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>Hiç %1 bağlantısı yapılandırılmamış.</translation>
</message>
@@ -186,7 +186,7 @@
<translation>Eşitleme işlemi devam ediyor.<br/>Durdurmak istiyor musunuz?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation><a href="%1">%2</a> ile bağlı.</translation>
</message>
@@ -196,12 +196,12 @@
<translation>%1/%2, %3/%4 dosya</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation><a href="%1">%2</a> bağlantısı <i>%3</i> olarak yapıldı.</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation>Şu anda depolama kullanım bilgisi mevcut değil.</translation>
</message>
@@ -596,15 +596,20 @@ Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Sunucudan E-Etiket alınamadı, Vekil sunucu/Ağ geçidini denetleyin.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Devam etmek üzere farklı bir E-Etiket altık. Sonraki işlemde yeniden denenecek.</translation>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1239,6 +1244,14 @@ Kullanmanız önerilmez.</translation>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1328,17 +1341,17 @@ Kullanmanız önerilmez.</translation>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Dosya yerel olarak düzenlendi ancak salt okunur paylaşımın bir parçası. Geri yüklendi ve düzenlemeniz çakışan dosyada.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation>Eşitleme sırasında yerel dosya değişti.</translation>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation>Sunucu son yığını onaylamadı. (Mevcut e-etiket bulunamadı)</translation>
</message>
diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts
index 649af71..a0e1853 100644
--- a/translations/mirall_uk.ts
+++ b/translations/mirall_uk.ts
@@ -156,17 +156,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>Жодного %1 підключення не налаштовано.</translation>
</message>
@@ -186,7 +186,7 @@
<translation>Виконується процедура синхронізації.<br/>Бажаєте відмінити?</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
@@ -196,12 +196,12 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -593,15 +593,20 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1233,6 +1238,14 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1322,17 +1335,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts
index c5eeef6..52ff367 100644
--- a/translations/mirall_zh_CN.ts
+++ b/translations/mirall_zh_CN.ts
@@ -156,17 +156,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>没有 %1 连接配置。</translation>
</message>
@@ -186,7 +186,7 @@
<translation>正在执行同步。<br />您确定要关闭它吗？</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
@@ -196,12 +196,12 @@
<translation>%1 of %2, file %3 of %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -593,15 +593,20 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1233,6 +1238,14 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1322,17 +1335,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts
index c5c61af..768a624 100644
--- a/translations/mirall_zh_TW.ts
+++ b/translations/mirall_zh_TW.ts
@@ -156,17 +156,17 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="717"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="718"/>
<source>%1 (%3%) of %2 server space in use.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="756"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="757"/>
<source>No connection to %1 at <a href="%2">%3</a>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="763"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="764"/>
<source>No %1 connection configured.</source>
<translation>無%1連線設定</translation>
</message>
@@ -186,7 +186,7 @@
<translation>正在同步中<br/>你真的想要中斷？</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="749"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="750"/>
<source>Connected to <a href="%1">%2</a>.</source>
<translation type="unfinished"/>
</message>
@@ -196,12 +196,12 @@
<translation>%1 的 %2, 檔案 %3 的 %4</translation>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="752"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="753"/>
<source>Connected to <a href="%1">%2</a> as <i>%3</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/accountsettings.cpp" line="721"/>
+ <location filename="../src/mirall/accountsettings.cpp" line="722"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
@@ -593,15 +593,20 @@ Are you sure you want to perform this operation?</source>
<context>
<name>Mirall::GETFileJob</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="381"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="402"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="388"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="409"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="637"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>Mirall::GeneralSettings</name>
@@ -1233,6 +1238,14 @@ It is not advisable to use it.</source>
</message>
</context>
<context>
+ <name>Mirall::PUTFileJob</name>
+ <message>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="93"/>
+ <source>Connection Timeout</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>Mirall::PropagateDownloadFileLegacy</name>
<message>
<location filename="../src/mirall/propagator_legacy.cpp" line="340"/>
@@ -1322,17 +1335,17 @@ It is not advisable to use it.</source>
<context>
<name>Mirall::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="241"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="258"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="266"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="283"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/mirall/propagator_qnam.cpp" line="276"/>
+ <location filename="../src/mirall/propagator_qnam.cpp" line="293"/>
<source>The server did not aknoledge the last chunk. (No e-tag were present)</source>
<translation type="unfinished"/>
</message>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list