浏览代码

fix(strings): differentiate setup(n) and set(v) up (#10024)

Correct GUI strings, translations and comments to use proper grammar.
Paul Donald 6 月之前
父节点
当前提交
5f5d672a7d
共有 50 个文件被更改,包括 50 次插入51 次删除
  1. 1 1
      cmd/infra/strelaypoolsrv/README.md
  2. 1 1
      cmd/syncthing/monitor.go
  3. 1 1
      gui/default/assets/lang/lang-ar.json
  4. 1 1
      gui/default/assets/lang/lang-bg.json
  5. 1 1
      gui/default/assets/lang/lang-ca.json
  6. 1 1
      gui/default/assets/lang/[email protected]
  7. 1 1
      gui/default/assets/lang/lang-cs.json
  8. 1 1
      gui/default/assets/lang/lang-da.json
  9. 1 1
      gui/default/assets/lang/lang-de.json
  10. 1 1
      gui/default/assets/lang/lang-el.json
  11. 1 1
      gui/default/assets/lang/lang-en-AU.json
  12. 1 1
      gui/default/assets/lang/lang-en-GB.json
  13. 1 1
      gui/default/assets/lang/lang-en.json
  14. 1 1
      gui/default/assets/lang/lang-eo.json
  15. 1 1
      gui/default/assets/lang/lang-es.json
  16. 1 1
      gui/default/assets/lang/lang-eu.json
  17. 1 1
      gui/default/assets/lang/lang-fi.json
  18. 1 1
      gui/default/assets/lang/lang-fil.json
  19. 1 1
      gui/default/assets/lang/lang-fr.json
  20. 1 1
      gui/default/assets/lang/lang-fy.json
  21. 1 1
      gui/default/assets/lang/lang-ga.json
  22. 1 1
      gui/default/assets/lang/lang-gl.json
  23. 1 1
      gui/default/assets/lang/lang-he-IL.json
  24. 1 1
      gui/default/assets/lang/lang-hi.json
  25. 1 1
      gui/default/assets/lang/lang-hu.json
  26. 1 1
      gui/default/assets/lang/lang-id.json
  27. 1 1
      gui/default/assets/lang/lang-it.json
  28. 1 1
      gui/default/assets/lang/lang-ko-KR.json
  29. 1 1
      gui/default/assets/lang/lang-lt.json
  30. 1 1
      gui/default/assets/lang/lang-nb.json
  31. 1 1
      gui/default/assets/lang/lang-nl.json
  32. 1 1
      gui/default/assets/lang/lang-pl.json
  33. 1 1
      gui/default/assets/lang/lang-pt-BR.json
  34. 1 1
      gui/default/assets/lang/lang-pt-PT.json
  35. 0 1
      gui/default/assets/lang/lang-ro-RO.json
  36. 1 1
      gui/default/assets/lang/lang-ru.json
  37. 1 1
      gui/default/assets/lang/lang-si.json
  38. 1 1
      gui/default/assets/lang/lang-sk.json
  39. 1 1
      gui/default/assets/lang/lang-sl.json
  40. 1 1
      gui/default/assets/lang/lang-sv.json
  41. 1 1
      gui/default/assets/lang/lang-tr.json
  42. 1 1
      gui/default/assets/lang/lang-uk.json
  43. 1 1
      gui/default/assets/lang/lang-zh-CN.json
  44. 1 1
      gui/default/assets/lang/lang-zh-HK.json
  45. 1 1
      gui/default/assets/lang/lang-zh-TW.json
  46. 2 2
      gui/default/index.html
  47. 1 1
      lib/dialer/internal.go
  48. 1 1
      lib/fs/basicfs_watch.go
  49. 1 1
      lib/protocol/protocol_test.go
  50. 1 1
      lib/syncthing/syncthing.go

+ 1 - 1
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.

+ 1 - 1
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

+ 1 - 1
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": "إصدارات الملف",

+ 1 - 1
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": "Версии на файловете",

+ 1 - 1
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",

+ 1 - 1
gui/default/assets/lang/[email protected]

@@ -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",

+ 1 - 1
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ů",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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": "Τήρηση εκδόσεων αρχείων",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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": "ניהול גרסאות קבצים",

+ 1 - 1
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": "फाइल संस्करणीकरण",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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": "파일 버전 관리",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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",

+ 0 - 1
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",

+ 1 - 1
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": "Управление версиями",

+ 1 - 1
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": "ගොනු අනුවාදය",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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",

+ 1 - 1
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": "Версіонування файлів",

+ 1 - 1
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": "文件版本控制",

+ 1 - 1
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": "版本控制",

+ 1 - 1
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": "檔案版本控制",

+ 2 - 2
gui/default/index.html

@@ -521,7 +521,7 @@
                             </span>
                             <span ng-if="folder.fsWatcherEnabled && !folder.paused && folderStatus(folder) !== 'stopped' && model[folder.id].watchError" tooltip data-original-title="{{'Periodic scanning at given interval and failed setting up watching for changes, retrying every 1m:' | translate}}<br/>{{model[folder.id].watchError}}">
                               <span class="far fa-clock"></span>&nbsp;{{folder.rescanIntervalS | duration}}&ensp;
-                              <span class="fas fa-eye-slash"></span>&nbsp;<span translate>Failed to setup, retrying</span>
+                              <span class="fas fa-eye-slash"></span>&nbsp;<span translate>Failed to set up, retrying</span>
                             </span>
                           </div>
                           <div ng-if="folder.rescanIntervalS <= 0">
@@ -535,7 +535,7 @@
                             </span>
                             <span ng-if="folder.fsWatcherEnabled && !folder.paused && folderStatus(folder) !== 'stopped' && model[folder.id].watchError" tooltip data-original-title="{{'Disabled periodic scanning and failed setting up watching for changes, retrying every 1m:' | translate}}<br/>{{model[folder.id].watchError}}">
                               <span class="far fa-clock"></span>&nbsp;<span translate>Disabled</span>&ensp;
-                              <span class="fas fa-eye-slash"></span>&nbsp;<span translate>Failed to setup, retrying</span>
+                              <span class="fas fa-eye-slash"></span>&nbsp;<span translate>Failed to set up, retrying</span>
                             </span>
                           </div>
                         </td>

+ 1 - 1
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")

+ 1 - 1
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
 	}

+ 1 - 1
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{})

+ 1 - 1
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()