From: Jenkins for ownCloud Date: Sun, 14 Feb 2016 07:18:43 +0000 (-0500) Subject: [tx-robot] updated from transifex X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~1369 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c84051c737aa897f23e62ebc80dd66f4928fe009;p=nextcloud-desktop.git [tx-robot] updated from transifex --- diff --git a/translations/client_it.ts b/translations/client_it.ts index 79d39d3cf..723fca3dc 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -652,7 +652,9 @@ Sei sicuro di voler eseguire questa operazione? This sync would reset the files to an erlier time in the sync folder '%1'. This might be because a backup was restored on the server. Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files? - + Questa sincronizzazione potrebbe ripristinare i file a una data precedente nella cartella di sincronizzazione '%1'. +Ciò potrebbe verificarsi in seguito al ripristino di un backup sul server. +Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tutti i tuoi file con file più datati in uno stato precedente. Vuoi mantenere i tuoi file locali più recenti come file di conflitto? diff --git a/translations/client_ja.ts b/translations/client_ja.ts index bb2bc4aad..dc8fa824b 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -657,12 +657,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an Backup detected - + バックアップが検出されました Normal Synchronisation - + 正常同期