diff --git a/mirall.desktop.in b/mirall.desktop.in index 71bd6dd60b..3cdfe5100b 100644 --- a/mirall.desktop.in +++ b/mirall.desktop.in @@ -733,6 +733,9 @@ X-GNOME-Autostart-Delay=3 # Translations +# Translations + + # Translations Comment[oc]=@APPLICATION_NAME@ sincronizacion del client GenericName[oc]=Dorsièr de Sincronizacion diff --git a/translations/client_ca.ts b/translations/client_ca.ts index b2c3000a1c..18d9b5bf91 100644 --- a/translations/client_ca.ts +++ b/translations/client_ca.ts @@ -770,34 +770,34 @@ If this was an accident and you decide to keep your files, they will be re-synce Esborra tots els fitxers? - + Remove all files Esborra tots els fitxers - + Keep files Mantén els fitxers - + This sync would reset the files to an earlier 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? - + Backup detected Copia de seguretat detectada - + Normal Synchronisation Sincronització normal - + Keep Local Files as Conflict Manté els fitxers locals com a conflicte diff --git a/translations/client_cs.ts b/translations/client_cs.ts index ed996c4e4f..76276c7a82 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -768,17 +768,17 @@ If this was an accident and you decide to keep your files, they will be re-synce Odstranit všechny soubory? - + Remove all files Odstranit všechny soubory - + Keep files Ponechat soubory - + This sync would reset the files to an earlier 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? @@ -787,17 +787,17 @@ Toto může být způsobeno obnovením zálohy na straně serveru. Pokračováním v synchronizaci způsobí přepsání všech vašich souborů staršími soubory z dřívějšího stavu. Přejete si ponechat své místní nejaktuálnější soubory jako konfliktní soubory? - + Backup detected Záloha nalezena - + Normal Synchronisation Normální synchronizace - + Keep Local Files as Conflict Ponechat místní soubory jako konflikt diff --git a/translations/client_de.ts b/translations/client_de.ts index b7ccc121c1..4ce2647086 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -775,17 +775,17 @@ Falls dies ein Missgeschick war und Sie sich zum Behalten der Datei entscheiden, Alle Dateien löschen? - + Remove all files Lösche alle Dateien - + Keep files Dateien behalten - + This sync would reset the files to an earlier 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? @@ -794,17 +794,17 @@ Der Grund dafür ist möglicherweise, dass auf dem Server ein Backup eingespielt Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älteren Versionen überschrieben. Möchten Sie die neueren Dateien als Konflikt-Dateien behalten? - + Backup detected Backup erkannt - + Normal Synchronisation Normale Synchronisation - + Keep Local Files as Conflict Lokale Konfliktdateien behalten diff --git a/translations/client_el.ts b/translations/client_el.ts index d03658e09f..41f8ac912f 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -768,34 +768,34 @@ If this was an accident and you decide to keep your files, they will be re-synce Αφαίρεση Όλων των Αρχείων; - + Remove all files Αφαίρεση όλων των αρχείων - + Keep files Διατήρηση αρχείων - + This sync would reset the files to an earlier 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? - + Backup detected Ανιχνεύθηκε αντίγραφο ασφαλείας - + Normal Synchronisation - + Keep Local Files as Conflict diff --git a/translations/client_en.ts b/translations/client_en.ts index 373dfd44c4..bc817b65f4 100644 --- a/translations/client_en.ts +++ b/translations/client_en.ts @@ -797,34 +797,34 @@ If this was an accident and you decide to keep your files, they will be re-synce - + Remove all files - + Keep files - + This sync would reset the files to an earlier 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? - + Backup detected - + Normal Synchronisation - + Keep Local Files as Conflict diff --git a/translations/client_es.ts b/translations/client_es.ts index 211a75ebc2..3b802ecdc2 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -775,17 +775,17 @@ Si ha sido un accidente, y decide mantener los archivos, serán re-sincronizados ¿Eliminar todos los archivos? - + Remove all files Eliminar todos los archivos - + Keep files Conservar archivos - + This sync would reset the files to an earlier 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? @@ -794,17 +794,17 @@ Esto puede deberse a que una copia de seguridad fue restaurada en el servidor. Si continua con la sincronización todos los archivos serán remplazados por su versión previa. ¿Desea mantener los archivos locales en su versión actual como archivos en conflicto? - + Backup detected Backup detectado - + Normal Synchronisation Sincronización Normal - + Keep Local Files as Conflict Mantener los archivos locales en caso de conflicto diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts index 8a5bae68fc..a8dea2e76d 100644 --- a/translations/client_es_AR.ts +++ b/translations/client_es_AR.ts @@ -768,34 +768,34 @@ If this was an accident and you decide to keep your files, they will be re-synce ¿Borrar todos los archivos? - + Remove all files Borrar todos los archivos - + Keep files Conservar archivos - + This sync would reset the files to an earlier 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? - + Backup detected - + Normal Synchronisation - + Keep Local Files as Conflict diff --git a/translations/client_et.ts b/translations/client_et.ts index 017dbdef9a..181d7ad03f 100644 --- a/translations/client_et.ts +++ b/translations/client_et.ts @@ -768,34 +768,34 @@ If this was an accident and you decide to keep your files, they will be re-synce Kustutada kõik failid? - + Remove all files Kustutada kõik failid - + Keep files Säilita failid - + This sync would reset the files to an earlier 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? - + Backup detected Leiti varukoopia - + Normal Synchronisation Tavaline sünkroonimine - + Keep Local Files as Conflict diff --git a/translations/client_eu.ts b/translations/client_eu.ts index 6b796e609c..4b73b585bd 100644 --- a/translations/client_eu.ts +++ b/translations/client_eu.ts @@ -768,34 +768,34 @@ If this was an accident and you decide to keep your files, they will be re-synce Ezabatu Fitxategi Guztiak? - + Remove all files Ezabatu fitxategi guztiak - + Keep files Mantendu fitxategiak - + This sync would reset the files to an earlier 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? - + Backup detected - + Normal Synchronisation - + Keep Local Files as Conflict diff --git a/translations/client_fa.ts b/translations/client_fa.ts index 4632cf3fe8..2d045a84d9 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -768,34 +768,34 @@ If this was an accident and you decide to keep your files, they will be re-synce حذف تمام فایل ها؟ - + Remove all files حذف تمام فایل ها - + Keep files نگه داشتن فایل ها - + This sync would reset the files to an earlier 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? - + Backup detected - + Normal Synchronisation - + Keep Local Files as Conflict diff --git a/translations/client_fi.ts b/translations/client_fi.ts index d7c84eb59b..5f5815475a 100644 --- a/translations/client_fi.ts +++ b/translations/client_fi.ts @@ -768,34 +768,34 @@ If this was an accident and you decide to keep your files, they will be re-synce Poistetaanko kaikki tiedostot? - + Remove all files Poista kaikki tiedostot - + Keep files Säilytä tiedostot - + This sync would reset the files to an earlier 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? - + Backup detected Varmuuskopio poistettu - + Normal Synchronisation Normaali synkronointi - + Keep Local Files as Conflict diff --git a/translations/client_fr.ts b/translations/client_fr.ts index e6666da0ba..a64aeac6c0 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -771,17 +771,17 @@ If this was an accident and you decide to keep your files, they will be re-synce Supprimer tous les fichiers ? - + Remove all files Supprimer tous les fichiers - + Keep files Garder les fichiers - + This sync would reset the files to an earlier 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? @@ -790,17 +790,17 @@ Cela peut être dû à une copie de sauvegarde restaurée sur le serveur. Continuer la synchronisation comme d'habitude fera en sorte que tous les fichiers soient remplacés par des fichiers plus vieux d'un état précédent. Voulez-vous garder les versions les plus récentes de vos fichiers en tant que fichiers conflictuels ? - + Backup detected Sauvegarde détectée - + Normal Synchronisation Synchronisation normale - + Keep Local Files as Conflict Garder les fichiers locaux comme Conflits @@ -928,7 +928,7 @@ Continuer la synchronisation comme d'habitude fera en sorte que tous les fi Synchronizing with local folder - Synchronisation en cours avec le dossier local + Synchronisé avec le dossier local diff --git a/translations/client_gl.ts b/translations/client_gl.ts index ce667cdea3..87b4c15671 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -768,34 +768,34 @@ If this was an accident and you decide to keep your files, they will be re-synce Retirar todos os ficheiros? - + Remove all files Retirar todos os ficheiros - + Keep files Manter os ficheiros - + This sync would reset the files to an earlier 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? - + Backup detected - + Normal Synchronisation - + Keep Local Files as Conflict diff --git a/translations/client_hu.ts b/translations/client_hu.ts index b89c536234..6bdab54d29 100644 --- a/translations/client_hu.ts +++ b/translations/client_hu.ts @@ -768,34 +768,34 @@ If this was an accident and you decide to keep your files, they will be re-synce Törli az összes fájlt? - + Remove all files Összes fájl eltávolítása - + Keep files Fájlok megtartása - + This sync would reset the files to an earlier 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? - + Backup detected Biztonsági mentés észlelve - + Normal Synchronisation Normal szinkronizáció - + Keep Local Files as Conflict Helyi file-ok megtartása konfliktusként diff --git a/translations/client_it.ts b/translations/client_it.ts index 8b4ed5e4c2..f968aa11ea 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -771,17 +771,17 @@ If this was an accident and you decide to keep your files, they will be re-synce Vuoi rimuovere tutti i file? - + Remove all files Rimuovi tutti i file - + Keep files Mantieni i file - + This sync would reset the files to an earlier 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? @@ -790,17 +790,17 @@ 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? - + Backup detected Backup rilevato - + Normal Synchronisation Sincronizzazione normale - + Keep Local Files as Conflict Mantieni i file locali come conflitto diff --git a/translations/client_ja.ts b/translations/client_ja.ts index 165a767743..e83c587388 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -768,34 +768,34 @@ If this was an accident and you decide to keep your files, they will be re-synce すべてのファイルを削除しますか？ - + Remove all files すべてのファイルを削除 - + Keep files ファイルを残す - + This sync would reset the files to an earlier 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? この同期により同期フォルダー '%1' のファイルが以前のものに戻されます。 これは、バックアップがサーバー上に復元されたためです。 通常と同じように同期を続けると、すべてのファイルが以前の状態の古いファイルによって上書きされます。最新のローカルファイルを競合ファイルとして保存しますか？ - + Backup detected バックアップが検出されました - + Normal Synchronisation 正常同期 - + Keep Local Files as Conflict コンフリクト時にローカルファイルを保持 diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts index d3906137d3..19b966aaa8 100644 --- a/translations/client_nb_NO.ts +++ b/translations/client_nb_NO.ts @@ -768,17 +768,17 @@ If this was an accident and you decide to keep your files, they will be re-synce Fjerne alle filer? - + Remove all files Fjern alle filer - + Keep files Behold filer - + This sync would reset the files to an earlier 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? @@ -787,17 +787,17 @@ Dette kan være fordi en backup ble gjenopprettet på serveren. Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrevet av en eldre fil i en tidligere tilstand. Ønsker du å beholde dine ferskeste lokale filer som konflikt-filer? - + Backup detected Backup oppdaget - + Normal Synchronisation Normal synkronisering - + Keep Local Files as Conflict Behold lokale filer som konflikt diff --git a/translations/client_nl.ts b/translations/client_nl.ts index f1165b594d..6dcccc9a42 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -770,17 +770,17 @@ If this was an accident and you decide to keep your files, they will be re-synce Verwijder alle bestanden? - + Remove all files Verwijder alle bestanden - + Keep files Bewaar bestanden - + This sync would reset the files to an earlier 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? @@ -789,17 +789,17 @@ Dit kan komen doordat een backup is hersteld op de server. Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere versie. Wilt u uw lokale meer recente bestanden behouden als conflict bestanden? - + Backup detected Backup gedetecteerd - + Normal Synchronisation Normale synchronisatie - + Keep Local Files as Conflict Behoud lokale bestanden als conflict diff --git a/translations/client_pl.ts b/translations/client_pl.ts index 4ff0129dfc..a8f7bb14db 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -770,34 +770,34 @@ If this was an accident and you decide to keep your files, they will be re-synce Usunąć wszystkie pliki? - + Remove all files Usuń wszystkie pliki - + Keep files Pozostaw pliki - + This sync would reset the files to an earlier 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? - + Backup detected Wykryto kopię zapasową. - + Normal Synchronisation Normalna synchronizacja. - + Keep Local Files as Conflict Zatrzymaj pliki lokalne i ustaw status konfliktu. diff --git a/translations/client_pt.ts b/translations/client_pt.ts index 6cdc1acbd8..7f346b9684 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -768,34 +768,34 @@ If this was an accident and you decide to keep your files, they will be re-synce Remover todos os ficheiros? - + Remove all files Remover todos os ficheiros - + Keep files Manter ficheiros - + This sync would reset the files to an earlier 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? - + Backup detected Detetada cópia de segurança - + Normal Synchronisation Sincronização Normal - + Keep Local Files as Conflict Manter Ficheiros Locais como Conflito diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index f27022a5fe..ec34ee6871 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -773,17 +773,17 @@ If this was an accident and you decide to keep your files, they will be re-synce Deseja Remover Todos os Arquivos? - + Remove all files Remover todos os arquivos - + Keep files Manter arquivos - + This sync would reset the files to an earlier 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? @@ -792,17 +792,17 @@ Isso pode ser porque um backup foi restaurado no servidor. Continuar a sincronização como normal fará com que todos os seus arquivos sejam substituídos por um arquivo antigo em um estado anterior. Deseja manter seus arquivos mais recentes locais como arquivos de conflito? - + Backup detected Backup detectado - + Normal Synchronisation Sincronização Normal - + Keep Local Files as Conflict Manter Arquivos Locais como Conflito diff --git a/translations/client_ru.ts b/translations/client_ru.ts index 977384b76e..3b2ec4fe40 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -775,34 +775,34 @@ If this was an accident and you decide to keep your files, they will be re-synce Удалить все файлы? - + Remove all files Удалить все файлы - + Keep files Сохранить файлы - + This sync would reset the files to an earlier 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? Эта синхронизация собирается сбросить файлы в катлоге '%1' в более ранее состояние. Такое может случиться, если на сервере восстановлена резервная копия. Если продолжать синхронизацию как обычно, то ваши файлы будут перетёрты более старыми версиями. Хотите сохранить ваши локальные свежие файлы в качестве конфликтных? - + Backup detected Обнаружена резервная копия - + Normal Synchronisation Обычная синхронизация - + Keep Local Files as Conflict Сохранить локальные файлы как конфликтующие diff --git a/translations/client_sk.ts b/translations/client_sk.ts index 3b79cd4a8f..c6dd8edff6 100644 --- a/translations/client_sk.ts +++ b/translations/client_sk.ts @@ -768,34 +768,34 @@ If this was an accident and you decide to keep your files, they will be re-synce Odstrániť všetky súbory? - + Remove all files Odstrániť všetky súbory - + Keep files Ponechať súbory - + This sync would reset the files to an earlier 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? - + Backup detected Záloha je dostupná - + Normal Synchronisation Bežná synchronizácia - + Keep Local Files as Conflict Ponechať lokálne súbory ako konfliktné diff --git a/translations/client_sl.ts b/translations/client_sl.ts index 71d898db3d..10054faec4 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -755,14 +755,19 @@ These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to keep the files, they will be re-synced with the server if you have rights to do so. If you decide to delete the files, they will be unavailable to you, unless you are the owner. - + Vse datoteke v usklajevani mapi »%1« so bile na strežniku izbrisane. +Sprememba bo usklajena tudi s krajevno mapo na disku, zato bodo te datoteke, če ni ustreznih dovoljenj za obnovitev, izgubljene. +V kolikor se odločite te datoteke ohraniti, in so na voljo ustrezna dovoljenja, bodo spet usklajene s strežnikom. +Nasprotno, če potrdite izbris in niste lastnik datotek, te ne bodo več na voljo. All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server. - + Vse datoteke v usklajevani mapi »%1« so bile izbrisane. Sprememba bo usklajena s strežnikom, zato bodo datoteke, če ni ustreznih dovoljenj za obnovitev, nedostopne. +Ali ste prepričani, da želite posodobiti spremembe s strežnikom? +Če je prišlo do napake in se odločite datoteke ohraniti, bodo te ponovno usklajene s strežnika. @@ -770,17 +775,17 @@ If this was an accident and you decide to keep your files, they will be re-synce Ali naj bodo odstranjene vse datoteke? - + Remove all files Odstrani vse datoteke - + Keep files Ohrani datoteke - + This sync would reset the files to an earlier 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? @@ -789,17 +794,17 @@ To se lahko zgodi, če je na strežniku na primer obnovljena varnostna kopija. Z nadaljevanjem usklajevanja bodo vse trenutne datoteke prepisane s starejšimi različicami. Ali želite ohraniti trenutne krajevne datoteke kot preimenovane datoteke v usklajevalnem sporu? - + Backup detected Varnostna kopija je zaznana - + Normal Synchronisation Običajno usklajevanje - + Keep Local Files as Conflict Ohrani krajevne datoteke kot datoteke v sporu diff --git a/translations/client_sr.ts b/translations/client_sr.ts index 4edf953426..cdc3b23a15 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -768,34 +768,34 @@ If this was an accident and you decide to keep your files, they will be re-synce Уклонити све фајлове? - + Remove all files Уклони све фајлове - + Keep files Остави фајлове - + This sync would reset the files to an earlier 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? - + Backup detected - + Normal Synchronisation - + Keep Local Files as Conflict diff --git a/translations/client_sv.ts b/translations/client_sv.ts index 660caa01b6..2deca300ca 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -768,17 +768,17 @@ If this was an accident and you decide to keep your files, they will be re-synce Ta bort alla filer? - + Remove all files Ta bort alla filer - + Keep files Behåll filer - + This sync would reset the files to an earlier 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? @@ -787,17 +787,17 @@ Detta kan vara för att en säkerhetskopia har återställts på servern. Om du fortsätter synkningen kommer alla dina filer återställas med en äldre version av filen. Vill du behålla dina nyare lokala filer som konfliktfiler? - + Backup detected Backup upptäckt - + Normal Synchronisation Normal synkronisation - + Keep Local Files as Conflict Behåll lokala filer som konflikt diff --git a/translations/client_th.ts b/translations/client_th.ts index bd3e6d7674..727cca5bb6 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -770,17 +770,17 @@ If this was an accident and you decide to keep your files, they will be re-synce ลบไฟล์ทั้งหมด? - + Remove all files ลบไฟล์ทั้งหมด - + Keep files เก็บไฟล์เอาไว้ - + This sync would reset the files to an earlier 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? @@ -789,17 +789,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an ไฟล์ปัจจุบันของคุณทั้งหมดจะถูกเขียนทับด้วยไฟล์เก่า คุณต้องการเก็บไฟล์ไว้หรือไม่? - + Backup detected ตรวจพบการสำรองข้อมูล - + Normal Synchronisation ประสานข้อมูลปกติ - + Keep Local Files as Conflict เก็บไฟล์ต้นทางเป็นไฟล์ที่มีปัญหา diff --git a/translations/client_tr.ts b/translations/client_tr.ts index be41611e51..ec365e0ca8 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -768,34 +768,34 @@ If this was an accident and you decide to keep your files, they will be re-synce Tüm Dosyalar Kaldırılsın mı? - + Remove all files Tüm dosyaları kaldır - + Keep files Dosyaları koru - + This sync would reset the files to an earlier 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? - + Backup detected Yedek bulundu - + Normal Synchronisation Normal Eşitleme - + Keep Local Files as Conflict Çakışma Durumunda Yerel Dosyaları Tut diff --git a/translations/client_uk.ts b/translations/client_uk.ts index 76d42ec281..852864108a 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -768,34 +768,34 @@ If this was an accident and you decide to keep your files, they will be re-synce Видалити усі файли? - + Remove all files Видалити усі файли - + Keep files Зберегти файли - + This sync would reset the files to an earlier 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? - + Backup detected Резервну копію знайдено - + Normal Synchronisation - + Keep Local Files as Conflict diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index f6c10133e6..8c3015032e 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -768,34 +768,34 @@ If this was an accident and you decide to keep your files, they will be re-synce 删除所有文件？ - + Remove all files 删除所有文件 - + Keep files 保持所有文件 - + This sync would reset the files to an earlier 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? - + Backup detected 备份已删除 - + Normal Synchronisation 正常同步 - + Keep Local Files as Conflict 保留本地文件为冲突文件 diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index 58af11494e..8c40f711f9 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -768,34 +768,34 @@ If this was an accident and you decide to keep your files, they will be re-synce 移除所有檔案? - + Remove all files 移除所有檔案 - + Keep files 保留檔案 - + This sync would reset the files to an earlier 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? - + Backup detected - + Normal Synchronisation - + Keep Local Files as Conflict