diff --git a/cmd/infra/strelaypoolsrv/README.md b/cmd/infra/strelaypoolsrv/README.md index a3cb3ce46..d40acae24 100644 --- a/cmd/infra/strelaypoolsrv/README.md +++ b/cmd/infra/strelaypoolsrv/README.md @@ -10,7 +10,7 @@ to NAT or firewall issues. There is very little reason why you'd want to run this yourself, as `relaypoolsrv` is just used for announcement and lookup of public relay -servers. If you are looking to setup a private or a public relay, please +servers. If you are looking to set up a private or a public relay, please check the documentation for [relaysrv](https://github.com/syncthing/relaysrv), which also explains how to join the default public pool. diff --git a/cmd/syncthing/monitor.go b/cmd/syncthing/monitor.go index a25f390fb..f91ee8323 100644 --- a/cmd/syncthing/monitor.go +++ b/cmd/syncthing/monitor.go @@ -64,7 +64,7 @@ func monitorMain(options serveOptions) { fileDst, err = open(logFile) } if err != nil { - l.Warnln("Failed to setup logging to file, proceeding with logging to stdout only:", err) + l.Warnln("Failed to set up logging to file, proceeding with logging to stdout only:", err) } else { if build.IsWindows { // Translate line breaks to Windows standard diff --git a/gui/default/assets/lang/lang-ar.json b/gui/default/assets/lang/lang-ar.json index 23f6063d4..5d7dbd1db 100644 --- a/gui/default/assets/lang/lang-ar.json +++ b/gui/default/assets/lang/lang-ar.json @@ -154,7 +154,7 @@ "Failed Items": "العناصر الفاشلة", "Failed to load file versions.": "لم يُتَوَصَّل لنسخة الملف.", "Failed to load ignore patterns.": "فشل التَّوَصُّل إلى مُرَشِّحات التجاهل.", - "Failed to setup, retrying": "فشل الإعداد، تجري المحاولة مرة أخرى", + "Failed to set up, retrying": "فشل الإعداد، تجري المحاولة مرة أخرى", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "يُتوقع فشل الاتصال بخوادم IPv6، إذا لم يكن IPv6 متاحا.", "File Pull Order": "ترتيب استيراد الملفات", "File Versioning": "إصدارات الملف", diff --git a/gui/default/assets/lang/lang-bg.json b/gui/default/assets/lang/lang-bg.json index 7f82c8f82..a7608ea68 100644 --- a/gui/default/assets/lang/lang-bg.json +++ b/gui/default/assets/lang/lang-bg.json @@ -156,7 +156,7 @@ "Failed Items": "Елементи с грешка", "Failed to load file versions.": "Грешка при зареждане на версии.", "Failed to load ignore patterns.": "Грешка при зареждане на шаблони за пренебрегване.", - "Failed to setup, retrying": "Грешка при настройване, извършва се повторен опит", + "Failed to set up, retrying": "Грешка при настройване, извършва се повторен опит", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Неуспешна връзка към сървъри по IPv6 може да се очаква ако няма свързаност по IPv6.", "File Pull Order": "Ред на изтегляне", "File Versioning": "Версии на файловете", diff --git a/gui/default/assets/lang/lang-ca.json b/gui/default/assets/lang/lang-ca.json index ad83adba1..e063dc039 100644 --- a/gui/default/assets/lang/lang-ca.json +++ b/gui/default/assets/lang/lang-ca.json @@ -154,7 +154,7 @@ "Failed Items": "Elements fallats", "Failed to load file versions.": "No s'han pogut carregar les versions dels fitxers.", "Failed to load ignore patterns.": "No s'han pogut carregar els patrons ignorats.", - "Failed to setup, retrying": "No s'ha pogut configurar, s'està tornant a provar", + "Failed to set up, retrying": "No s'ha pogut configurar, s'està tornant a provar", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "S'espera que no es pugui connectar als servidors IPv6 si no hi ha connectivitat IPv6.", "File Pull Order": "Ordre d'agafar fitxers", "File Versioning": "Versionat de Fitxers", diff --git a/gui/default/assets/lang/lang-ca@valencia.json b/gui/default/assets/lang/lang-ca@valencia.json index 41a46113b..883291b8c 100644 --- a/gui/default/assets/lang/lang-ca@valencia.json +++ b/gui/default/assets/lang/lang-ca@valencia.json @@ -150,7 +150,7 @@ "Failed Items": "Objectes fallits", "Failed to load file versions.": "No s'han pogut carregar les versions dels fitxers.", "Failed to load ignore patterns.": "No s'han pogut carregar els patrons ignorats.", - "Failed to setup, retrying": "Errada en la configuració, reintentant", + "Failed to set up, retrying": "Errada en la configuració, reintentant", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "És possible que es produïsca una fallada al connectar als servidors IPv6 si no hi ha connectivitat IPv6.", "File Pull Order": "Ordre de fitxers del pull", "File Versioning": "Versionat de fitxer", diff --git a/gui/default/assets/lang/lang-cs.json b/gui/default/assets/lang/lang-cs.json index 90d51326c..26f54c026 100644 --- a/gui/default/assets/lang/lang-cs.json +++ b/gui/default/assets/lang/lang-cs.json @@ -154,7 +154,7 @@ "Failed Items": "Nezdařené položky", "Failed to load file versions.": "Nepodařilo se nahrát verze souboru.", "Failed to load ignore patterns.": "Načtení vzorů ignorovaného se nezdařilo.", - "Failed to setup, retrying": "Nastavování se nezdařilo, zkouší se znovu", + "Failed to set up, retrying": "Nastavování se nezdařilo, zkouší se znovu", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Je v pořádku, když se připojení k IPv6 serverům nezdaří, pokud není k dispozici IPv6 konektivita.", "File Pull Order": "Pořadí stahování souborů", "File Versioning": "Správa verzí souborů", diff --git a/gui/default/assets/lang/lang-da.json b/gui/default/assets/lang/lang-da.json index d8f7433a9..30294efc8 100644 --- a/gui/default/assets/lang/lang-da.json +++ b/gui/default/assets/lang/lang-da.json @@ -154,7 +154,7 @@ "Failed Items": "Mislykkede filer", "Failed to load file versions.": "Fil versioner kunne ikke indlæses.", "Failed to load ignore patterns.": "Ignorerings-mønstre kunne ikke indlæses.", - "Failed to setup, retrying": "Opsætning mislykkedes; prøver igen", + "Failed to set up, retrying": "Opsætning mislykkedes; prøver igen", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Fejl i forbindelse med opkobling til IPv6-servere skal forventes, hvis der ikke er IPv6-forbindelse.", "File Pull Order": "Hentningsrækkefølge for filer", "File Versioning": "Filversionering", diff --git a/gui/default/assets/lang/lang-de.json b/gui/default/assets/lang/lang-de.json index 46489c8f8..2a62d8e1c 100644 --- a/gui/default/assets/lang/lang-de.json +++ b/gui/default/assets/lang/lang-de.json @@ -156,7 +156,7 @@ "Failed Items": "Fehlgeschlagene Elemente", "Failed to load file versions.": "Fehler beim Laden der Dateiversionen.", "Failed to load ignore patterns.": "Fehler beim Laden der Ignoriermuster.", - "Failed to setup, retrying": "Fehler beim Einrichten, erneuter Versuch", + "Failed to set up, retrying": "Fehler beim Einrichten, erneuter Versuch", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Ein Verbindungsfehler zu IPv6-Servern ist zu erwarten, wenn es keine IPv6-Konnektivität gibt.", "File Pull Order": "Dateiübertragungsreihenfolge", "File Versioning": "Dateiversionierung", diff --git a/gui/default/assets/lang/lang-el.json b/gui/default/assets/lang/lang-el.json index cc01555d5..6605ca991 100644 --- a/gui/default/assets/lang/lang-el.json +++ b/gui/default/assets/lang/lang-el.json @@ -154,7 +154,7 @@ "Failed Items": "Αρχεία που απέτυχαν", "Failed to load file versions.": "Η φόρτωση των εκδόσεων αρχείων απέτυχε.", "Failed to load ignore patterns.": "Αποτυχία φόρτωσης μοτίβων παράβλεψης.", - "Failed to setup, retrying": "Αποτυχία ενεργοποίησης, γίνεται νέα προσπάθεια", + "Failed to set up, retrying": "Αποτυχία ενεργοποίησης, γίνεται νέα προσπάθεια", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Είναι φυσιολογική η αποτυχία σύνδεσης σε εξυπηρετητές IPv6 όταν δεν υπάρχει συνδεσιμότητα IPv6.", "File Pull Order": "Σειρά με την οποία θα κατεβαίνουν τα αρχεία", "File Versioning": "Τήρηση εκδόσεων αρχείων", diff --git a/gui/default/assets/lang/lang-en-AU.json b/gui/default/assets/lang/lang-en-AU.json index a970d9841..a68e9d2f1 100644 --- a/gui/default/assets/lang/lang-en-AU.json +++ b/gui/default/assets/lang/lang-en-AU.json @@ -150,7 +150,7 @@ "Failed Items": "Failed Items", "Failed to load file versions.": "Failed to load file versions.", "Failed to load ignore patterns.": "Failed to load ignore patterns.", - "Failed to setup, retrying": "Failed to setup, retrying", + "Failed to set up, retrying": "Failed to set up, retrying", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.", "File Pull Order": "File Pull Order", "File Versioning": "File Versioning", diff --git a/gui/default/assets/lang/lang-en-GB.json b/gui/default/assets/lang/lang-en-GB.json index 1b6762c09..1602bc92a 100644 --- a/gui/default/assets/lang/lang-en-GB.json +++ b/gui/default/assets/lang/lang-en-GB.json @@ -154,7 +154,7 @@ "Failed Items": "Failed Items", "Failed to load file versions.": "Failed to load file versions.", "Failed to load ignore patterns.": "Failed to load ignore patterns.", - "Failed to setup, retrying": "Failed to setup, retrying", + "Failed to set up, retrying": "Failed to set up, retrying", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.", "File Pull Order": "File Pull Order", "File Versioning": "File Versioning", diff --git a/gui/default/assets/lang/lang-en.json b/gui/default/assets/lang/lang-en.json index e58b799e6..916eea972 100644 --- a/gui/default/assets/lang/lang-en.json +++ b/gui/default/assets/lang/lang-en.json @@ -156,7 +156,7 @@ "Failed Items": "Failed Items", "Failed to load file versions.": "Failed to load file versions.", "Failed to load ignore patterns.": "Failed to load ignore patterns.", - "Failed to setup, retrying": "Failed to setup, retrying", + "Failed to set up, retrying": "Failed to set up, retrying", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.", "File Pull Order": "File Pull Order", "File Versioning": "File Versioning", diff --git a/gui/default/assets/lang/lang-eo.json b/gui/default/assets/lang/lang-eo.json index 26984bef0..d306f946d 100644 --- a/gui/default/assets/lang/lang-eo.json +++ b/gui/default/assets/lang/lang-eo.json @@ -106,7 +106,7 @@ "Error": "Eraro", "External File Versioning": "Ekstera Versionado de Dosiero", "Failed Items": "Malsukcesaj Eroj", - "Failed to setup, retrying": "Malsukcesis agordi, provante denove", + "Failed to set up, retrying": "Malsukcesis agordi, provante denove", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Malsukceso por konekti al IPv6 serviloj atendante se ekzistas neniu IPv6 konektebleco.", "File Pull Order": "Ordo por Tiri Dosieron", "File Versioning": "Versionado de Dosieroj", diff --git a/gui/default/assets/lang/lang-es.json b/gui/default/assets/lang/lang-es.json index fea96535a..67d42927e 100644 --- a/gui/default/assets/lang/lang-es.json +++ b/gui/default/assets/lang/lang-es.json @@ -154,7 +154,7 @@ "Failed Items": "Elementos fallidos", "Failed to load file versions.": "Error al cargar las versiones de los archivos.", "Failed to load ignore patterns.": "No se pudieron cargar los patrones de ignorar.", - "Failed to setup, retrying": "Fallo en la configuración, reintentando", + "Failed to set up, retrying": "Fallo en la configuración, reintentando", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Se espera un fallo al conectar a los servidores IPv6 si no hay conectividad IPv6.", "File Pull Order": "Orden de Obtención de los Archivos", "File Versioning": "Versionado de ficheros", diff --git a/gui/default/assets/lang/lang-eu.json b/gui/default/assets/lang/lang-eu.json index 7ea952864..1c9799eb9 100644 --- a/gui/default/assets/lang/lang-eu.json +++ b/gui/default/assets/lang/lang-eu.json @@ -130,7 +130,7 @@ "External File Versioning": "Fitxategi bertsioen kanpoko kudeaketa", "Failed Items": "Huts egin duten fitxategiak", "Failed to load ignore patterns.": "Huts egin du baztertze ereduak kargatzean.", - "Failed to setup, retrying": "Konfigurazioan huts egitea, berriro saiatuz", + "Failed to set up, retrying": "Konfigurazioan huts egitea, berriro saiatuz", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "IPv6 zerbitzariei buruzko konexioak huts eginen du, IPv6 konektibitaterik ez bada", "File Pull Order": "Fitxategiak berreskuratzeko ordena", "File Versioning": "Fitxategiak zaintzeko metodoa", diff --git a/gui/default/assets/lang/lang-fi.json b/gui/default/assets/lang/lang-fi.json index b6ee38807..09dbbcad2 100644 --- a/gui/default/assets/lang/lang-fi.json +++ b/gui/default/assets/lang/lang-fi.json @@ -122,7 +122,7 @@ "External": "Ulkoinen", "External File Versioning": "Ulkoinen tiedostoversionti", "Failed Items": "Epäonnistuneet kohteet", - "Failed to setup, retrying": "Käyttöönotto epäonnistui, Yritetään uudelleen", + "Failed to set up, retrying": "Käyttöönotto epäonnistui, Yritetään uudelleen", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Yhteys IPv6-palvelimiin todennäköisesti epäonnistuu, koska IPv6-yhteyksiä ei ole.", "File Pull Order": "Tiedostojen noutojärjestys", "File Versioning": "Tiedostoversiointi", diff --git a/gui/default/assets/lang/lang-fil.json b/gui/default/assets/lang/lang-fil.json index 8d4b94bea..8a2cdc19f 100644 --- a/gui/default/assets/lang/lang-fil.json +++ b/gui/default/assets/lang/lang-fil.json @@ -154,7 +154,7 @@ "Failed Items": "Mga Nabigong Item", "Failed to load file versions.": "Nabigong i-load ang mga bersyon ng file.", "Failed to load ignore patterns.": "Nabigong i-load ang mga ignore pattern.", - "Failed to setup, retrying": "Nabigong i-set up, sinusubukan muli", + "Failed to set up, retrying": "Nabigong i-set up, sinusubukan muli", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Inaasahan ang pagbigo sa pagkonekta sa mga IPv6 na server kapag walang konektibidad sa IPv6.", "File Pull Order": "Order ng Pagkuha ng File", "File Versioning": "File Versioning", diff --git a/gui/default/assets/lang/lang-fr.json b/gui/default/assets/lang/lang-fr.json index cb701ee33..90a2ddf0f 100644 --- a/gui/default/assets/lang/lang-fr.json +++ b/gui/default/assets/lang/lang-fr.json @@ -156,7 +156,7 @@ "Failed Items": "Éléments en échec", "Failed to load file versions.": "Échec de chargement des versions de fichiers.", "Failed to load ignore patterns.": "Échec du chargement des masques d'exclusions.", - "Failed to setup, retrying": "Échec, nouvel essai", + "Failed to set up, retrying": "Échec, nouvel essai", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "La connexion aux serveurs en IPv6 va échouer s'il n'y a pas de connectivité IPv6.", "File Pull Order": "Ordre de récupération des fichiers", "File Versioning": "Préservation des fichiers", diff --git a/gui/default/assets/lang/lang-fy.json b/gui/default/assets/lang/lang-fy.json index 8bf70b38e..592989d1f 100644 --- a/gui/default/assets/lang/lang-fy.json +++ b/gui/default/assets/lang/lang-fy.json @@ -146,7 +146,7 @@ "Error": "Flater", "External File Versioning": "Ekstern ferzjebehear foar triemen", "Failed Items": "Mislearre items", - "Failed to setup, retrying": "Ynskeakeljen mislearre, wurd no opnij besocht", + "Failed to set up, retrying": "Ynskeakeljen mislearre, wurd no opnij besocht", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Mislearjen fan it ferbinen mei IPv6-tsjinners wurd ferwachte as der gjin stipe foar IPv6-ferbinings is.", "File Pull Order": "Triemlûkfolchoarder", "File Versioning": "Triemferzjebehear", diff --git a/gui/default/assets/lang/lang-ga.json b/gui/default/assets/lang/lang-ga.json index b74ec41bb..5a9b6d84c 100644 --- a/gui/default/assets/lang/lang-ga.json +++ b/gui/default/assets/lang/lang-ga.json @@ -156,7 +156,7 @@ "Failed Items": "Míreanna Teipthe", "Failed to load file versions.": "Theip ar luchtú leaganacha comhaid.", "Failed to load ignore patterns.": "Theip ar phatrúin neamhairde a luchtú.", - "Failed to setup, retrying": "Theip ar thus, ag triail arís", + "Failed to set up, retrying": "Theip ar thus, ag triail arís", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Táthar ag súil le mainneachtain ceangal le freastalaithe IPv6 mura bhfuil nascacht IPv6 ann.", "File Pull Order": "Ordú Tarraingthe Comhad", "File Versioning": "Leagan Comhaid", diff --git a/gui/default/assets/lang/lang-gl.json b/gui/default/assets/lang/lang-gl.json index ffd742ac1..3fd9b1a6b 100644 --- a/gui/default/assets/lang/lang-gl.json +++ b/gui/default/assets/lang/lang-gl.json @@ -153,7 +153,7 @@ "Failed Items": "Elmentos fallados", "Failed to load file versions.": "Fallou a carga das versións dos ficheiros.", "Failed to load ignore patterns.": "Fallou a carga de patróns ignorados.", - "Failed to setup, retrying": "Fallou a configuración, reintentando", + "Failed to set up, retrying": "Fallou a configuración, reintentando", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "É de agardar o fallo ao conectar con servidores IPv6 se non hai conexión por IPv6.", "File Pull Order": "Orde de Obtención de Arquivos", "File Versioning": "Versionado de Ficheiros", diff --git a/gui/default/assets/lang/lang-he-IL.json b/gui/default/assets/lang/lang-he-IL.json index 260a1a9c8..15cad7a67 100644 --- a/gui/default/assets/lang/lang-he-IL.json +++ b/gui/default/assets/lang/lang-he-IL.json @@ -154,7 +154,7 @@ "Failed Items": "פריטים שנכשלו", "Failed to load file versions.": "טעינת גרסאות קבצים נכשלה.", "Failed to load ignore patterns.": "טעינת דפוסי התעלמות נכשלה.", - "Failed to setup, retrying": "ההגדרה נכשלה, מנסה שוב", + "Failed to set up, retrying": "ההגדרה נכשלה, מנסה שוב", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "צפוי כשל בהתחברות לשרתי IPv6 אם אין קישוריות IPv6.", "File Pull Order": "סדר משיכת קבצים", "File Versioning": "ניהול גרסאות קבצים", diff --git a/gui/default/assets/lang/lang-hi.json b/gui/default/assets/lang/lang-hi.json index cd0e527a4..5aa71dfd3 100644 --- a/gui/default/assets/lang/lang-hi.json +++ b/gui/default/assets/lang/lang-hi.json @@ -154,7 +154,7 @@ "Failed Items": "विफल वस्तुएं", "Failed to load file versions.": "फाइल संस्करण लोड करने में विफल।", "Failed to load ignore patterns.": "नजरअंदाज प्रतिमान लोड करने में विफल।", - "Failed to setup, retrying": "स्थापना करने में विफल, पुनः प्रयास किया जा रहा है", + "Failed to set up, retrying": "स्थापना करने में विफल, पुनः प्रयास किया जा रहा है", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "यदि IPv6 संयोजकता नहीं है तो IPv6 सर्वर से जुड़ने में विफलता अपेक्षित है।", "File Pull Order": "फाइल खींचने का क्रम", "File Versioning": "फाइल संस्करणीकरण", diff --git a/gui/default/assets/lang/lang-hu.json b/gui/default/assets/lang/lang-hu.json index 7d84f226f..190c67c92 100644 --- a/gui/default/assets/lang/lang-hu.json +++ b/gui/default/assets/lang/lang-hu.json @@ -146,7 +146,7 @@ "Failed Items": "Hibás elemek", "Failed to load file versions.": "Nem sikerült betölteni a fájlverziókat.", "Failed to load ignore patterns.": "Nem sikerült betölteni a mellőzési mintákat.", - "Failed to setup, retrying": "Telepítés nem sikerült, újrapróbálkozás", + "Failed to set up, retrying": "Telepítés nem sikerült, újrapróbálkozás", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Mivel nincs IPv6 kapcsolat, ezért várhatóan nem fog sikerülni IPv6-os szerverekhez csatlakozni.", "File Pull Order": "Fájlküldési sorrend", "File Versioning": "Fájlverzió-követés", diff --git a/gui/default/assets/lang/lang-id.json b/gui/default/assets/lang/lang-id.json index 3d50a8617..af79c4adb 100644 --- a/gui/default/assets/lang/lang-id.json +++ b/gui/default/assets/lang/lang-id.json @@ -146,7 +146,7 @@ "Failed Items": "Berkas yang gagal", "Failed to load file versions.": "Gagal memuat versi berkas.", "Failed to load ignore patterns.": "Gagal memuat pola pengabaian.", - "Failed to setup, retrying": "Gagal menyiapkan, mengulang", + "Failed to set up, retrying": "Gagal menyiapkan, mengulang", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Gagal untuk menyambung ke server IPv6 itu disangka apabila tidak ada konektivitas IPv6.", "File Pull Order": "Urutan Penarikan Berkas", "File Versioning": "Pemversian Berkas", diff --git a/gui/default/assets/lang/lang-it.json b/gui/default/assets/lang/lang-it.json index f5d1593b2..513eb45cc 100644 --- a/gui/default/assets/lang/lang-it.json +++ b/gui/default/assets/lang/lang-it.json @@ -156,7 +156,7 @@ "Failed Items": "Elementi Errati", "Failed to load file versions.": "Impossibile caricare le versioni dei file.", "Failed to load ignore patterns.": "Impossibile caricare gli schemi di esclusione.", - "Failed to setup, retrying": "Configurazione fallita, riprovo", + "Failed to set up, retrying": "Configurazione fallita, riprovo", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "La connessione a server IPv6 fallisce se non c'è connettività IPv6.", "File Pull Order": "Ordine Prelievo File", "File Versioning": "Controllo Versione File", diff --git a/gui/default/assets/lang/lang-ko-KR.json b/gui/default/assets/lang/lang-ko-KR.json index f583ed148..28d1890ab 100644 --- a/gui/default/assets/lang/lang-ko-KR.json +++ b/gui/default/assets/lang/lang-ko-KR.json @@ -156,7 +156,7 @@ "Failed Items": "실패 항목", "Failed to load file versions.": "파일 버전을 불러오기에 실패했습니다.", "Failed to load ignore patterns.": "무시 양식을 불러오기에 실패했습니다.", - "Failed to setup, retrying": "설정 적용 실패; 재시도 중", + "Failed to set up, retrying": "설정 적용 실패; 재시도 중", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "IPv6에 연결되어 있지 않을 때는 IPv6 서버에 접속하지 못하는 것이 정상입니다.", "File Pull Order": "파일 수신 순서", "File Versioning": "파일 버전 관리", diff --git a/gui/default/assets/lang/lang-lt.json b/gui/default/assets/lang/lang-lt.json index a2e3c0201..8e9b32ecc 100644 --- a/gui/default/assets/lang/lang-lt.json +++ b/gui/default/assets/lang/lang-lt.json @@ -144,7 +144,7 @@ "Failed Items": "Nepavykę siuntimai", "Failed to load file versions.": "Nepavyko įkelti failo versijų.", "Failed to load ignore patterns.": "Nepavyko įkelti nepaisymo šablonų.", - "Failed to setup, retrying": "Nepavyko nustatyti, bandoma iš naujo", + "Failed to set up, retrying": "Nepavyko nustatyti, bandoma iš naujo", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Nesėkmė prisijungti prie IPv6 serverių yra tikėtina, jei nėra IPv6 ryšio.", "File Pull Order": "Failų siuntimo tvarka", "File Versioning": "Versijų valdymas", diff --git a/gui/default/assets/lang/lang-nb.json b/gui/default/assets/lang/lang-nb.json index b76287a78..63aed272c 100644 --- a/gui/default/assets/lang/lang-nb.json +++ b/gui/default/assets/lang/lang-nb.json @@ -154,7 +154,7 @@ "Failed Items": "Elementsynkronisering som har mislyktes", "Failed to load file versions.": "Lasting av fil-versjoner feilet.", "Failed to load ignore patterns.": "Lasting av ignorer mønstre feilet.", - "Failed to setup, retrying": "Klarte ikke å utføre oppsett, prøver igjen", + "Failed to set up, retrying": "Klarte ikke å utføre oppsett, prøver igjen", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Å ikke klare å koble til IPv6-tjenere er forventet hvis det ikke er noen IPv6-tilknytning.", "File Pull Order": "Filenes henterekkefølge", "File Versioning": "Versjonskontroll", diff --git a/gui/default/assets/lang/lang-nl.json b/gui/default/assets/lang/lang-nl.json index ab50da08a..df5710368 100644 --- a/gui/default/assets/lang/lang-nl.json +++ b/gui/default/assets/lang/lang-nl.json @@ -154,7 +154,7 @@ "Failed Items": "Mislukte items", "Failed to load file versions.": "Laden van bestandsversies mislukt.", "Failed to load ignore patterns.": "Laden van negeerpatronen mislukt.", - "Failed to setup, retrying": "Instellen mislukt, opnieuw proberen", + "Failed to set up, retrying": "Instellen mislukt, opnieuw proberen", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Als er geen IPv6-connectiviteit is worden problemen bij verbinden met IPv6-servers verwacht.", "File Pull Order": "Volgorde voor binnenhalen van bestanden", "File Versioning": "Versiebeheer", diff --git a/gui/default/assets/lang/lang-pl.json b/gui/default/assets/lang/lang-pl.json index cf687ac0d..8871404ae 100644 --- a/gui/default/assets/lang/lang-pl.json +++ b/gui/default/assets/lang/lang-pl.json @@ -156,7 +156,7 @@ "Failed Items": "Elementy zakończone niepowodzeniem", "Failed to load file versions.": "Nie udało się załadować wersji plików.", "Failed to load ignore patterns.": "Nie udało się załadować wzorców ignorowania.", - "Failed to setup, retrying": "Nie udało się ustawić; ponawiam próbę", + "Failed to set up, retrying": "Nie udało się ustawić; ponawiam próbę", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Błąd połączenia do serwerów IPv6 może wystąpić, gdy w ogóle nie ma połączenia po IPv6.", "File Pull Order": "Kolejność pobierania plików", "File Versioning": "Wersjonowanie plików", diff --git a/gui/default/assets/lang/lang-pt-BR.json b/gui/default/assets/lang/lang-pt-BR.json index 2e3569114..20f3d0ec1 100644 --- a/gui/default/assets/lang/lang-pt-BR.json +++ b/gui/default/assets/lang/lang-pt-BR.json @@ -156,7 +156,7 @@ "Failed Items": "Itens com falha", "Failed to load file versions.": "Falha ao carregar versões do arquivo.", "Failed to load ignore patterns.": "Falha ao carregar os padrões para ignorar.", - "Failed to setup, retrying": "Não foi possível configurar, tentando novamente", + "Failed to set up, retrying": "Não foi possível configurar, tentando novamente", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Falhas na conexão a servidores IPv6 são esperadas caso não haja conectividade IPv6.", "File Pull Order": "Ordem de retirada do arquivo", "File Versioning": "Versionamento de arquivos", diff --git a/gui/default/assets/lang/lang-pt-PT.json b/gui/default/assets/lang/lang-pt-PT.json index 9a2d61900..d07fbb2ad 100644 --- a/gui/default/assets/lang/lang-pt-PT.json +++ b/gui/default/assets/lang/lang-pt-PT.json @@ -156,7 +156,7 @@ "Failed Items": "Itens que falharam", "Failed to load file versions.": "Falha ao carregar as versões do ficheiro.", "Failed to load ignore patterns.": "Falha ao carregar os padrões de exclusão.", - "Failed to setup, retrying": "A preparação falhou, a tentar novamente", + "Failed to set up, retrying": "A preparação falhou, a tentar novamente", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "São esperadas falhas na ligação a servidores IPv6 se não existir conectividade IPv6.", "File Pull Order": "Ordem de obtenção de ficheiros", "File Versioning": "Gestão de versões de ficheiros", diff --git a/gui/default/assets/lang/lang-ro-RO.json b/gui/default/assets/lang/lang-ro-RO.json index 71c61fad8..9ed7d2eb4 100644 --- a/gui/default/assets/lang/lang-ro-RO.json +++ b/gui/default/assets/lang/lang-ro-RO.json @@ -143,7 +143,6 @@ "Error": "Eroare", "External File Versioning": "Administrare externă a versiunilor documentului", "Failed Items": "Failed Items", - "Failed to setup, retrying": "Failed to setup, retrying", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.", "File Pull Order": "File Pull Order", "File Versioning": "Versiune Fișier", diff --git a/gui/default/assets/lang/lang-ru.json b/gui/default/assets/lang/lang-ru.json index c1844bb52..64b4800c5 100644 --- a/gui/default/assets/lang/lang-ru.json +++ b/gui/default/assets/lang/lang-ru.json @@ -154,7 +154,7 @@ "Failed Items": "Сбойные объекты", "Failed to load file versions.": "Не удалось загрузить версии файлов.", "Failed to load ignore patterns.": "Не удалось загрузить шаблоны игнорирования.", - "Failed to setup, retrying": "Не удалось настроить, пробуем ещё", + "Failed to set up, retrying": "Не удалось настроить, пробуем ещё", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Если нет IPv6-соединений, при подключении к IPv6-серверам произойдёт ошибка.", "File Pull Order": "Порядок получения файлов", "File Versioning": "Управление версиями", diff --git a/gui/default/assets/lang/lang-si.json b/gui/default/assets/lang/lang-si.json index 4e8129d85..f0257118b 100644 --- a/gui/default/assets/lang/lang-si.json +++ b/gui/default/assets/lang/lang-si.json @@ -143,7 +143,7 @@ "Failed Items": "අසාර්ථක අයිතම", "Failed to load file versions.": "ගොනු අනුවාද පූරණය කිරීමට අසමත් විය.", "Failed to load ignore patterns.": "නොසලකා හැරීමේ රටා පූරණය කිරීමට අසමත් විය.", - "Failed to setup, retrying": "පිහිටුවීමට අසමත් විය, උත්සාහ කරමින්", + "Failed to set up, retrying": "පිහිටුවීමට අසමත් විය, උත්සාහ කරමින්", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "IPv6 සම්බන්ධතාවක් නොමැති නම් IPv6 සේවාදායක වෙත සම්බන්ධ වීමට අසමත් වීම අපේක්ෂා කෙරේ.", "File Pull Order": "ගොනු ඇදීමේ නියෝගය", "File Versioning": "ගොනු අනුවාදය", diff --git a/gui/default/assets/lang/lang-sk.json b/gui/default/assets/lang/lang-sk.json index 33dac0d71..d45e017ea 100644 --- a/gui/default/assets/lang/lang-sk.json +++ b/gui/default/assets/lang/lang-sk.json @@ -153,7 +153,7 @@ "Failed Items": "Zlyhané položky", "Failed to load file versions.": "Nepodarilo sa načítať verzie súborov.", "Failed to load ignore patterns.": "Nepodarilo sa načítať ignorované vzory.", - "Failed to setup, retrying": "Nepodarilo sa nastaviť, opakujem", + "Failed to set up, retrying": "Nepodarilo sa nastaviť, opakujem", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Zlyhanie pripojenia k IPv6 serverom je očakávané ak neexistujú žiadne IPv6 pripojenia.", "File Pull Order": "Poradie sťahovania súborov", "File Versioning": "Verzie súborov", diff --git a/gui/default/assets/lang/lang-sl.json b/gui/default/assets/lang/lang-sl.json index b5bc23714..fcb4168d8 100644 --- a/gui/default/assets/lang/lang-sl.json +++ b/gui/default/assets/lang/lang-sl.json @@ -131,7 +131,7 @@ "External File Versioning": "Zunanje beleženje različic datotek", "Failed Items": "Neuspeli predmeti", "Failed to load ignore patterns.": "Prezrih vzorcev ni bilo mogoče naložiti.", - "Failed to setup, retrying": "Nastavitev ni uspela, ponovni poskus", + "Failed to set up, retrying": "Nastavitev ni uspela, ponovni poskus", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Neuspeh povezav z IPv6 strežniki je pričakovan, če ni IPv6 povezljivost.", "File Pull Order": "Vrstni red prenosa datotek", "File Versioning": "Beleženje različic datotek", diff --git a/gui/default/assets/lang/lang-sv.json b/gui/default/assets/lang/lang-sv.json index 597c9526f..d04b1b79f 100644 --- a/gui/default/assets/lang/lang-sv.json +++ b/gui/default/assets/lang/lang-sv.json @@ -154,7 +154,7 @@ "Failed Items": "Misslyckade objekt", "Failed to load file versions.": "Det gick inte att läsa in filversioner.", "Failed to load ignore patterns.": "Det gick inte att läsa in ignoreringsmönster.", - "Failed to setup, retrying": "Det gick inte att ställa in, försöker igen", + "Failed to set up, retrying": "Det gick inte att ställa in, försöker igen", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "Det går inte att ansluta till IPv6-servrar om det inte finns någon IPv6-anslutning.", "File Pull Order": "Filhämtningsprioritering", "File Versioning": "Filversionshantering", diff --git a/gui/default/assets/lang/lang-tr.json b/gui/default/assets/lang/lang-tr.json index 456b00b96..e5de4c141 100644 --- a/gui/default/assets/lang/lang-tr.json +++ b/gui/default/assets/lang/lang-tr.json @@ -156,7 +156,7 @@ "Failed Items": "Başarısız Olan Öğeler", "Failed to load file versions.": "Dosya sürümlerini yükleme başarısız.", "Failed to load ignore patterns.": "Yoksayma şekillerini yükleme başarısız.", - "Failed to setup, retrying": "Ayarlama başarısız, yeniden deneniyor", + "Failed to set up, retrying": "Ayarlama başarısız, yeniden deneniyor", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "IPv6 bağlanabilirliği yoksa IPv6 sunucularına bağlanma hatası beklenmekte.", "File Pull Order": "Dosya Çekme Sırası", "File Versioning": "Dosya Sürümlendirme", diff --git a/gui/default/assets/lang/lang-uk.json b/gui/default/assets/lang/lang-uk.json index d90a27bdb..6107e9a99 100644 --- a/gui/default/assets/lang/lang-uk.json +++ b/gui/default/assets/lang/lang-uk.json @@ -156,7 +156,7 @@ "Failed Items": "Невдалі", "Failed to load file versions.": "Не вдалося завантажити версії файлів.", "Failed to load ignore patterns.": "Не вдалося завантажити шаблони ігнорування.", - "Failed to setup, retrying": "Не вдалося налаштувати, повторна спроба", + "Failed to set up, retrying": "Не вдалося налаштувати, повторна спроба", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "За відсутності з'єднання IPv6 очікується неможливість під'єднання до серверів IPv6.", "File Pull Order": "Порядок витягнення файлів", "File Versioning": "Версіонування файлів", diff --git a/gui/default/assets/lang/lang-zh-CN.json b/gui/default/assets/lang/lang-zh-CN.json index c07b4cc71..19de2a862 100644 --- a/gui/default/assets/lang/lang-zh-CN.json +++ b/gui/default/assets/lang/lang-zh-CN.json @@ -156,7 +156,7 @@ "Failed Items": "失败的项目", "Failed to load file versions.": "加载文件版本失败。", "Failed to load ignore patterns.": "加载忽略模式失败。", - "Failed to setup, retrying": "设置失败，正在重试", + "Failed to set up, retrying": "设置失败，正在重试", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "如果本机没有配置 IPv6，则无法连接 IPv6 服务器是正常的。", "File Pull Order": "文件拉取顺序", "File Versioning": "文件版本控制", diff --git a/gui/default/assets/lang/lang-zh-HK.json b/gui/default/assets/lang/lang-zh-HK.json index bac06d4a7..7549a976d 100644 --- a/gui/default/assets/lang/lang-zh-HK.json +++ b/gui/default/assets/lang/lang-zh-HK.json @@ -145,7 +145,7 @@ "Failed Items": "失敗的項目", "Failed to load file versions.": "無法加載文件版本。", "Failed to load ignore patterns.": "無法加載忽略模式。", - "Failed to setup, retrying": "設置失敗，正在重試。", + "Failed to set up, retrying": "設置失敗，正在重試。", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "如果本機沒有配置IPv6，則無法連接IPv6服務器是正常的。", "File Pull Order": "文件拉取順序", "File Versioning": "版本控制", diff --git a/gui/default/assets/lang/lang-zh-TW.json b/gui/default/assets/lang/lang-zh-TW.json index 8b93d30cd..6735ed26e 100644 --- a/gui/default/assets/lang/lang-zh-TW.json +++ b/gui/default/assets/lang/lang-zh-TW.json @@ -154,7 +154,7 @@ "Failed Items": "失敗的項目", "Failed to load file versions.": "無法載入檔案版本。", "Failed to load ignore patterns.": "無法載入忽略模式。", - "Failed to setup, retrying": "無法設定，正在重試", + "Failed to set up, retrying": "無法設定，正在重試", "Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.": "若沒有 IPv6 連線能力，則無法連接 IPv6 伺服器為正常現象。", "File Pull Order": "提取檔案的順序", "File Versioning": "檔案版本控制", diff --git a/gui/default/index.html b/gui/default/index.html index 2140ef1dc..aba8a411a 100644 --- a/gui/default/index.html +++ b/gui/default/index.html @@ -521,7 +521,7 @@  {{folder.rescanIntervalS | duration}}  -  Failed to setup, retrying +  Failed to set up, retrying
@@ -535,7 +535,7 @@  Disabled  -  Failed to setup, retrying +  Failed to set up, retrying
diff --git a/lib/dialer/internal.go b/lib/dialer/internal.go index c4a4e153e..c810359ef 100644 --- a/lib/dialer/internal.go +++ b/lib/dialer/internal.go @@ -28,7 +28,7 @@ func init() { TLSHandshakeTimeout: 10 * time.Second, } - // Defer this, so that logging gets setup. + // Defer this, so that logging gets set up. go func() { time.Sleep(500 * time.Millisecond) l.Infoln("Proxy settings detected") diff --git a/lib/fs/basicfs_watch.go b/lib/fs/basicfs_watch.go index bf20c6439..f785c06c9 100644 --- a/lib/fs/basicfs_watch.go +++ b/lib/fs/basicfs_watch.go @@ -54,7 +54,7 @@ func (f *BasicFilesystem) Watch(name string, ignore Matcher, ctx context.Context if err != nil { notify.Stop(backendChan) if reachedMaxUserWatches(err) { - err = errors.New("failed to setup inotify handler. Please increase inotify limits, see https://docs.syncthing.net/users/faq.html#inotify-limits") + err = errors.New("failed to set up inotify handler. Please increase inotify limits, see https://docs.syncthing.net/users/faq.html#inotify-limits") } return nil, nil, err } diff --git a/lib/protocol/protocol_test.go b/lib/protocol/protocol_test.go index c4f304126..fe2646b08 100644 --- a/lib/protocol/protocol_test.go +++ b/lib/protocol/protocol_test.go @@ -205,7 +205,7 @@ func TestClusterConfigFirst(t *testing.T) { case c.outbox <- asyncMessage{&bep.Ping{}, nil}: t.Fatal("able to send ping before cluster config") case <-time.After(100 * time.Millisecond): - // Allow some time for c.writerLoop to setup after c.Start + // Allow some time for c.writerLoop to set up after c.Start } c.ClusterConfig(&ClusterConfig{}) diff --git a/lib/syncthing/syncthing.go b/lib/syncthing/syncthing.go index 7d562abf7..cf1397f1e 100644 --- a/lib/syncthing/syncthing.go +++ b/lib/syncthing/syncthing.go @@ -269,7 +269,7 @@ func (a *App) startup() error { // Chicken and egg, discovery manager depends on connection service to tell it what addresses it's listening on // Connection service depends on discovery manager to get addresses to connect to. - // Create a wrapper that is then wired after they are both setup. + // Create a wrapper that is then wired after they are both set up. addrLister := &lateAddressLister{} connRegistry := registry.New()