diff options
57 files changed, 582 insertions, 302 deletions
diff --git a/.tx/nextcloud.client-desktop/de_translation b/.tx/nextcloud.client-desktop/de_translation index 79e8bb599..52903defb 100644 --- a/.tx/nextcloud.client-desktop/de_translation +++ b/.tx/nextcloud.client-desktop/de_translation @@ -21,7 +21,7 @@ Icon=@APPLICATION_EXECUTABLE@ # Translations -Icon[de]=@APPLICATION_ICON_NAME@ -Name[de]=@APPLICATION_NAME@ Desktop -Comment[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisierung -GenericName[de]=Ordner-Synchronisation +Icon[de_DE]=@APPLICATION_ICON_NAME@ +Name[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisierung +Comment[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisierung +GenericName[de_DE]=Ordnersynchronisierung diff --git a/translations/client_bg.ts b/translations/client_bg.ts index e5224878a..57ab4cd1d 100644 --- a/translations/client_bg.ts +++ b/translations/client_bg.ts @@ -923,27 +923,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation>Локален файл е променен по време на синхронизирането.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation>Грешка при актуализиране на метаданни: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation>Файлът %1 в момента се използва</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation>Локален файл е премахнат по време на синхронизирането.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation>; Възстановяването е Неуспешно: % 1</translation> </message> diff --git a/translations/client_br.ts b/translations/client_br.ts index 2e97ad843..45c3a984a 100644 --- a/translations/client_br.ts +++ b/translations/client_br.ts @@ -919,27 +919,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_ca.ts b/translations/client_ca.ts index e95c99b53..348d10c7b 100644 --- a/translations/client_ca.ts +++ b/translations/client_ca.ts @@ -918,27 +918,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_cs.ts b/translations/client_cs.ts index cd12a6bbb..1c4820fd6 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -923,27 +923,32 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci.</tr </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation>Místní soubor byl změněn během synchronizace.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation>Chyba při aktualizování metadat: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation>Soubor %1 je v tuto chvíli používán jinou aplikací</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation>Místní soubor byl odstraněn během synchronizace.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation>; Obnovení se nezdařilo: %1</translation> </message> diff --git a/translations/client_da.ts b/translations/client_da.ts index c04aa9683..4dda06e41 100644 --- a/translations/client_da.ts +++ b/translations/client_da.ts @@ -923,27 +923,32 @@ Denne handling vil annullere alle i øjeblikket kørende synkroniseringer.</tran </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_de.ts b/translations/client_de.ts index 732408c85..85506c070 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -923,27 +923,32 @@ Diese Aktion bricht jede derzeit laufende Synchronisierung ab.</translation> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation>Lokale Datei wurde während der Synchronisierung geändert.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation>Fehler beim Aktualisieren der Metadaten: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation>Die Datei %1 wird aktuell verwendet</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation>Die lokale Datei wurde während der Synchronisierung gelöscht.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation>; Wiederherstellung fehlgeschlagen: %1</translation> </message> diff --git a/translations/client_el.ts b/translations/client_el.ts index fc49fe9b4..cad514ece 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -919,27 +919,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index 2f3e93055..8b7c49ee2 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -918,27 +918,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_eo.ts b/translations/client_eo.ts index 921eb1f47..dd31bb4e5 100644 --- a/translations/client_eo.ts +++ b/translations/client_eo.ts @@ -918,27 +918,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es.ts b/translations/client_es.ts index 3cd9b5b90..495ecb22e 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -923,27 +923,32 @@ Además, esta acción interrumpirá cualquier sincronización en curso.</transla </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation>Un archivo local ha cambiado durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation>Error al actualizar los metadatos: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation>El archivo %1 se encuentra en uso</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation>El archivo local ha sido eliminado durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation>; Fallo al restaurar: %1</translation> </message> diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts index 6913dbfe5..f448d769f 100644 --- a/translations/client_es_AR.ts +++ b/translations/client_es_AR.ts @@ -918,27 +918,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_CL.ts b/translations/client_es_CL.ts index d8ad4c075..ddb765990 100644 --- a/translations/client_es_CL.ts +++ b/translations/client_es_CL.ts @@ -918,27 +918,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_CO.ts b/translations/client_es_CO.ts index 22d772b2a..4c68c5d52 100644 --- a/translations/client_es_CO.ts +++ b/translations/client_es_CO.ts @@ -918,27 +918,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_CR.ts b/translations/client_es_CR.ts index bfe278e72..e9d203af6 100644 --- a/translations/client_es_CR.ts +++ b/translations/client_es_CR.ts @@ -918,27 +918,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_DO.ts b/translations/client_es_DO.ts index f3fac131c..1a222d5dd 100644 --- a/translations/client_es_DO.ts +++ b/translations/client_es_DO.ts @@ -918,27 +918,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_EC.ts b/translations/client_es_EC.ts index 1f013fcba..3075ff78d 100644 --- a/translations/client_es_EC.ts +++ b/translations/client_es_EC.ts @@ -918,27 +918,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_GT.ts b/translations/client_es_GT.ts index f4a9bd1f9..4c1ea799a 100644 --- a/translations/client_es_GT.ts +++ b/translations/client_es_GT.ts @@ -918,27 +918,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_HN.ts b/translations/client_es_HN.ts index e95b43a5f..7af466869 100644 --- a/translations/client_es_HN.ts +++ b/translations/client_es_HN.ts @@ -918,27 +918,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_MX.ts b/translations/client_es_MX.ts index 844881596..a90eb2d75 100644 --- a/translations/client_es_MX.ts +++ b/translations/client_es_MX.ts @@ -918,27 +918,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_SV.ts b/translations/client_es_SV.ts index f501032ab..65b46168d 100644 --- a/translations/client_es_SV.ts +++ b/translations/client_es_SV.ts @@ -918,27 +918,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_et.ts b/translations/client_et.ts index 14d9a1c5e..eae98b3cd 100644 --- a/translations/client_et.ts +++ b/translations/client_et.ts @@ -918,27 +918,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_eu.ts b/translations/client_eu.ts index e774f4404..85b99921b 100644 --- a/translations/client_eu.ts +++ b/translations/client_eu.ts @@ -923,27 +923,32 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du.</translation> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation>Fitxategi lokala aldatu da sinkronizazioan.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation>Erorrea metadatuak eguneratzen: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation>%1 fitxategia momentu honetan erabilpean dago</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation>Fitxategi lokala ezabatu da sinkronizazioan.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation>; Berreskurapenak huts egin du: %1</translation> </message> diff --git a/translations/client_fa.ts b/translations/client_fa.ts index ed24839b3..2da7e5af6 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -918,27 +918,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_fi.ts b/translations/client_fi.ts index 4352fe140..00ac7db76 100644 --- a/translations/client_fi.ts +++ b/translations/client_fi.ts @@ -922,27 +922,32 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_fr.ts b/translations/client_fr.ts index a8d430453..e8fe5cbeb 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -921,27 +921,32 @@ Vous prenez vos propres risques.</translation> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation>Fichier local modifié pendant la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation>Erreur à la mise à jour des méta-données : %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation>Le fichier %1 est en cours d'utilisation</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation>Le fichier local a été supprimé pendant la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation>; Restauration échouée : %1</translation> </message> diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 929c24f8b..86077ae81 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -923,27 +923,32 @@ Esta acción interromperá calquera sincronización que estea a executarse actua </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_he.ts b/translations/client_he.ts index 40633fa9b..5d8626c52 100644 --- a/translations/client_he.ts +++ b/translations/client_he.ts @@ -919,27 +919,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_hr.ts b/translations/client_hr.ts index a916f02d5..c7bc8aa85 100644 --- a/translations/client_hr.ts +++ b/translations/client_hr.ts @@ -923,27 +923,32 @@ Ova će radnja prekinuti bilo koju trenutačnu sinkronizaciju.</translation> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_hu.ts b/translations/client_hu.ts index e2205de22..f0eb431b7 100644 --- a/translations/client_hu.ts +++ b/translations/client_hu.ts @@ -923,27 +923,32 @@ Ez a művelet megszakítja a jelenleg futó szinkronizálást.</translation> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation>A helyi fájl megváltozott szinkronizálás közben.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation>Hiba a metaadatok frissítésekor: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation>A(z) %1 fájl épp használatban van</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation>A helyi fájl el lett távolítva szinkronizálás közben.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation>; Sikertelen helyreállítás: %1</translation> </message> diff --git a/translations/client_id.ts b/translations/client_id.ts index b4bea5457..59100b407 100644 --- a/translations/client_id.ts +++ b/translations/client_id.ts @@ -918,27 +918,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_is.ts b/translations/client_is.ts index b5ce111e5..790409594 100644 --- a/translations/client_is.ts +++ b/translations/client_is.ts @@ -924,27 +924,32 @@ gagnageymslur: </translation> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_it.ts b/translations/client_it.ts index 838221e69..2efb335dd 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -923,27 +923,32 @@ Questa azione interromperà qualsiasi sincronizzazione attualmente in esecuzione </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation>File locale modificato durante la sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation>Errore di aggiornamento dei metadati: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation>Il file %1 è attualmente in uso</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation>Il file locale è stato rimosso durante la sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation>; Ripristino fallito: %1</translation> </message> diff --git a/translations/client_ja.ts b/translations/client_ja.ts index 59e951d23..062abbf73 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -923,27 +923,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation>ローカルのファイルが同期中に変更されました。</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation>メタデータの更新中にエラーが発生しました: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation>ファイル %1 は現在使用中です</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation>同期中にローカルファイルが削除されました。</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_ko.ts b/translations/client_ko.ts index 150b14b58..41f8fa5d6 100644 --- a/translations/client_ko.ts +++ b/translations/client_ko.ts @@ -923,27 +923,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation>동기화 중 로컬 파일이 변경되었습니다.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation>메타데이터 갱신 오류: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation>파일 %1(이)가 현재 사용 중입니다.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation>동기화 중 로컬 파일이 삭제되었습니다.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation>; 복원 실패: %1</translation> </message> diff --git a/translations/client_lt_LT.ts b/translations/client_lt_LT.ts index 8a8c51e19..8a065aee6 100644 --- a/translations/client_lt_LT.ts +++ b/translations/client_lt_LT.ts @@ -918,27 +918,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_lv.ts b/translations/client_lv.ts index 46e227ee6..82b419a3e 100644 --- a/translations/client_lv.ts +++ b/translations/client_lv.ts @@ -918,27 +918,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_mk.ts b/translations/client_mk.ts index 53fa6f973..ba7393bac 100644 --- a/translations/client_mk.ts +++ b/translations/client_mk.ts @@ -918,27 +918,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts index d17ba0f2f..24927b100 100644 --- a/translations/client_nb_NO.ts +++ b/translations/client_nb_NO.ts @@ -923,27 +923,32 @@ Denne handlingen vil avbryte enhver synkronisering som kjører.</translation> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation>Lokal fil er endret samtidig med synkronisering.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation>Feil ved oppdatering av metadata: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation>Filen %1 er i bruk</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation> Lokal fil er slettet samtidig med synkronisering.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_nl.ts b/translations/client_nl.ts index c2f59485a..3b9ef9d5a 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -922,27 +922,32 @@ Dit zal alle synchronisaties, die op dit moment bezig zijn, afbreken.</translati </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation>Lokaal bestand gewijzigd tijdens synchronisatie.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation>Fout bij bijwerken metadata: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation>Bestand %1 is momenteel in gebruik</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation>Het lokale bestand werd verwijderd tijdens synchronisatie.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation>; Herstellen mislukt: %1</translation> </message> diff --git a/translations/client_oc.ts b/translations/client_oc.ts index 2d9c57a43..86183cd4c 100644 --- a/translations/client_oc.ts +++ b/translations/client_oc.ts @@ -918,27 +918,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_pl.ts b/translations/client_pl.ts index e35366777..f92c94f5d 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -923,27 +923,32 @@ Ta czynność spowoduje przerwanie aktualnie uruchomionej synchronizacji.</trans </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation>Plik lokalny zmieniony podczas synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation>Błąd podczas aktualizowania metadanych: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation>Plik %1 jest aktualnie używany</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation>Plik lokalny został usunięty podczas synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation>; Przywracanie nie powiodło się: %1</translation> </message> diff --git a/translations/client_pt.ts b/translations/client_pt.ts index 6dbfd1abf..83769f5bf 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -918,27 +918,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index 2b5b54bfb..e0e48f36f 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -923,27 +923,32 @@ Esta ação irá cancelar qualquer sincronização atualmente em execução.</tr </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation>Arquivo local alterado durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation>Erro ao atualizar metadados: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation>O arquivo %1 está atualmente em uso</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation>O arquivo local foi removido durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation>; A restauração falhou: %1</translation> </message> diff --git a/translations/client_ro.ts b/translations/client_ro.ts index 3f8c22994..a17891c3a 100644 --- a/translations/client_ro.ts +++ b/translations/client_ro.ts @@ -923,27 +923,32 @@ Această acțiune va opri toate sincronizările în derulare din acest moment.</ </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_ru.ts b/translations/client_ru.ts index c4ac1368e..1b0ec4d67 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -922,27 +922,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation>Локальный файл изменился во время синхронизации.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation>Ошибка обновления метаданных: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation>В настоящее время используется файл %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation>Локальный файл был удален во время синхронизации.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation>; Восстановление не удалось: %1</translation> </message> @@ -3520,7 +3525,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/discovery.cpp" line="501"/> <source>Server reported no %1</source> - <translation>Сервер сообщил об отсутствии % 1</translation> + <translation>Сервер сообщил об отсутствии %1</translation> </message> <message> <location filename="../src/libsync/discovery.cpp" line="946"/> diff --git a/translations/client_sc.ts b/translations/client_sc.ts index f3cd3209d..6f2908641 100644 --- a/translations/client_sc.ts +++ b/translations/client_sc.ts @@ -923,27 +923,32 @@ Custa atzione at a firmare cale si siat sincronizatzione immoe in esecutzione.</ </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_sk.ts b/translations/client_sk.ts index 70163ad02..4d88c588b 100644 --- a/translations/client_sk.ts +++ b/translations/client_sk.ts @@ -923,27 +923,32 @@ Táto akcia zruší všetky prebiehajúce synchronizácie.</translation> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation>Lokálny súbor bol zmenený počas synchronizácie.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation>Chyba pri aktualizácii metadát: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation>Súbor %1 sa v súčasnosti používa</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation>Lokálny súbor bol odstránený počas synchronizácie.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation>; Obnovenie zlyhalo: %1</translation> </message> diff --git a/translations/client_sl.ts b/translations/client_sl.ts index a032354bd..f11bb7e78 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -923,27 +923,32 @@ S tem dejanjem prav tako prekinete vsa trenutna usklajevanja v izvajanju.</trans </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation>Krajevna datoteka je bila med usklajevanjem spremenjena.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation>Prišlo je do napake posodabljanja metapodatkov: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation>Datoteka %1 je trenutno v uporabi.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation>Krajevna datoteka je bila med usklajevanjem odstranjena.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation>Obnovitev je spodletela: %1</translation> </message> diff --git a/translations/client_sr.ts b/translations/client_sr.ts index 17ceede5e..30223f22d 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -919,27 +919,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_sv.ts b/translations/client_sv.ts index f0b9d1f48..97afcf122 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -919,27 +919,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_th.ts b/translations/client_th.ts index 6fc95b2e3..5a55afb66 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -918,27 +918,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 1cce95662..539b47bc1 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -923,27 +923,32 @@ Bu işlem şu anda yürütülmekte olan eşitleme işlemlerini durdurur.</transl </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation>Yerel dosya eşitleme sırasında değişmiş.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation>Üst veriler güncellenirken sorun çıktı: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation>%1 dosyası şu anda kullanılıyor</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation>Yerel dosya eşitleme sırasında silinmiş.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation>; Geri yüklenemedi: %1</translation> </message> diff --git a/translations/client_uk.ts b/translations/client_uk.ts index 2d922d6b6..8f8644cda 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -919,27 +919,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index bb35c91e1..4a75ab325 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -4,7 +4,7 @@ <message> <location filename="../src/gui/tray/ActivityItem.qml" line="26"/> <source>In %1</source> - <translation type="unfinished"/> + <translation>在 %1</translation> </message> <message> <location filename="../src/gui/tray/ActivityItem.qml" line="40"/> @@ -39,7 +39,7 @@ <location filename="../src/gui/tray/ActivityItemActions.qml" line="77"/> <location filename="../src/gui/tray/ActivityItemActions.qml" line="79"/> <source>Show more actions</source> - <translation type="unfinished"/> + <translation>显示更多操作</translation> </message> </context> <context> @@ -48,12 +48,12 @@ <location filename="../src/gui/tray/ActivityItemContent.qml" line="90"/> <location filename="../src/gui/tray/ActivityItemContent.qml" line="92"/> <source>Dismiss</source> - <translation type="unfinished"/> + <translation>忽略</translation> </message> <message> <location filename="../src/gui/tray/ActivityItemContent.qml" line="121"/> <source>Open share dialog</source> - <translation type="unfinished"/> + <translation>打开共享对话框</translation> </message> </context> <context> @@ -910,7 +910,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/> <source>File %1 has invalid modification time. Do not upload to the server.</source> - <translation type="unfinished"/> + <translation>文件 %1 修改时间无效。不要上传到服务器。</translation> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="313"/> @@ -919,27 +919,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation>本地文件在同步时发生变化。</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation>更新元数据出错:%1 </translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation>文件 %1 在使用中</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation>本地文件在同步时被删除</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation>; 还原失败:%1</translation> </message> @@ -1130,7 +1135,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/libsync/discoveryphase.cpp" line="189"/> <source>Error while canceling deletion of a file</source> - <translation type="unfinished"/> + <translation>取消删除一个文件时出错</translation> </message> <message> <location filename="../src/libsync/discoveryphase.cpp" line="189"/> @@ -1140,7 +1145,7 @@ This action will abort any currently running synchronization.</source> <message> <location filename="../src/libsync/discoveryphase.cpp" line="190"/> <source>Error while canceling deletion of %1</source> - <translation type="unfinished"/> + <translation>取消删除 %1 时发生错误</translation> </message> <message> <location filename="../src/libsync/discoveryphase.cpp" line="190"/> @@ -2384,12 +2389,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from <message> <location filename="../src/gui/internallinkwidget.ui" line="64"/> <source>Internal link</source> - <translation type="unfinished"/> + <translation>内部链接</translation> </message> <message> <location filename="../src/gui/internallinkwidget.ui" line="83"/> <source>Only works for users with access to this folder</source> - <translation type="unfinished"/> + <translation>仅适用于有权限访问此文件夹的用户</translation> </message> </context> <context> @@ -3376,12 +3381,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/passwordinputdialog.ui" line="23"/> <source>Password for share required</source> - <translation type="unfinished"/> + <translation>需要共享密码</translation> </message> <message> <location filename="../src/gui/passwordinputdialog.ui" line="35"/> <source>Please enter a password for your share:</source> - <translation type="unfinished"/> + <translation>请输入您的共享链接密码:</translation> </message> </context> <context> @@ -3580,7 +3585,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/libsync/owncloudpropagator.cpp" line="1136"/> <source>Error updating metadata due to invalid modification time</source> - <translation type="unfinished"/> + <translation>由于修改时间无效,更新元数据时出错</translation> </message> <message> <location filename="../src/libsync/owncloudpropagator.cpp" line="1136"/> @@ -3887,7 +3892,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <location filename="../src/libsync/propagateupload.cpp" line="377"/> <location filename="../src/libsync/propagateupload.cpp" line="390"/> <source>File %1 has invalid modification time. Do not upload to the server.</source> - <translation type="unfinished"/> + <translation>文件 %1 修改时间无效。不要上传到服务器。</translation> </message> <message> <location filename="../src/libsync/propagateupload.cpp" line="302"/> @@ -5385,7 +5390,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> <source>Error updating metadata due to invalid modification time</source> - <translation type="unfinished"/> + <translation>由于修改时间无效,更新元数据时出错</translation> </message> <message> <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> @@ -5400,7 +5405,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> <source>Error updating metadata due to invalid modification time</source> - <translation type="unfinished"/> + <translation>由于修改时间无效,更新元数据时出错</translation> </message> <message> <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> @@ -5933,12 +5938,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <message> <location filename="../src/gui/tray/activitylistmodel.cpp" line="697"/> <source>Mark as read</source> - <translation type="unfinished"/> + <translation>标记为已读</translation> </message> <message> <location filename="../src/gui/tray/activitylistmodel.cpp" line="699"/> <source>Reply</source> - <translation type="unfinished"/> + <translation>回复</translation> </message> <message numerus="yes"> <location filename="../src/common/utility.cpp" line="482"/> diff --git a/translations/client_zh_HK.ts b/translations/client_zh_HK.ts index ee79869ea..0ac868cf0 100644 --- a/translations/client_zh_HK.ts +++ b/translations/client_zh_HK.ts @@ -924,27 +924,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation>近端端的檔案在同步過程中被更改。</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation>更新元數據時出錯:%1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation>檔案 %1 正在使用中</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation>近端的檔案在同步過程中被刪除。</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation>;復原失敗 %1</translation> </message> diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index 8277bd160..fbc2b4615 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -923,27 +923,32 @@ This action will abort any currently running synchronization.</source> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="327"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="640"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="646"/> <source>Local file changed during sync.</source> <translation>本機檔案在同步的過程中被修改。</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="459"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/> + <source>Network Error: %1</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/> <source>Error updating metadata: %1</source> <translation>更新詮釋資料時發生錯誤:%1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="462"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="468"/> <source>The file %1 is currently in use</source> <translation>檔案 %1 目前使用中</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="623"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="629"/> <source>The local file was removed during sync.</source> <translation>本機檔案在同步的過程中被移除。</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="670"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/> <source>; Restoration Failed: %1</source> <translation>;復原失敗:%1</translation> </message> |