diff --git a/gui/default/assets/lang/lang-fr.json b/gui/default/assets/lang/lang-fr.json index 907bd7f09..b9878bb38 100644 --- a/gui/default/assets/lang/lang-fr.json +++ b/gui/default/assets/lang/lang-fr.json @@ -212,7 +212,7 @@ "Outgoing Rate Limit (KiB/s)": "Limite du débit d'envoi (Kio/s)", "Override Changes": "Écraser les changements", "Path": "Chemin", - "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Dans l'écran de \"Personnalisation\" des valeurs par défaut (menu Actions/Configuration), ce champ indique le chemin dans lequel les partages acceptés automatiquement seront créés, ainsi que chemin de base suggéré lors de l'enregistrement des nouveaux partages. Le caractère tilde (~) est un raccourci pour {{tilde}}.\nEn création/acceptation manuelle d'un nouveau partage, c'est le chemin vers le répertoire à partager dans l'appareil local. Il sera créé s'il n'existe pas. Vous pouvez entrer un chemin absolu (p.ex \"/home/moi/Sync/Exemple\") ou relatif à celui du programme (p.ex \"..\\Partages\\Exemple\" - utile pour installation portable). Le caractère tilde (~, ou ~+Espace sous Windows) peut être utilisé comme raccourci vers", + "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Dans l'écran de \"Personnalisation\" des valeurs par défaut (menu Actions/Configuration), ce champ indique le chemin dans lequel les partages acceptés automatiquement seront créés, ainsi que chemin de base suggéré lors de l'enregistrement des nouveaux partages. Le caractère tilde (~) est un raccourci pour votre répertoire personnel {{tilde}} .\nEn création/acceptation manuelle d'un nouveau partage, c'est le chemin vers le répertoire à partager dans l'appareil local. Il sera créé s'il n'existe pas. Vous pouvez entrer un chemin absolu (p.ex \"/home/moi/Sync/Exemple\") ou relatif à celui du programme (p.ex \"..\\Partages\\Exemple\" - utile pour installation portable). Le caractère tilde (~, taper ~+Espace sous Windows) peut être utilisé comme raccourci vers", "Path where new auto accepted folders will be created, as well as the default suggested path when adding new folders via the UI. Tilde character (~) expands to {%tilde%}.": "Chemin dans lequel les partages acceptés automatiquement seront créés, ainsi que chemin suggéré lors de l'enregistrement des nouveaux partages via cette interface graphique. Le caractère tilde (~) est un raccourci pour {{tilde}}.", "Path where versions should be stored (leave empty for the default .stversions directory in the shared folder).": "Chemin où les versions seront conservées (laisser vide pour le chemin par défaut de .stversions (caché) dans le partage).\nChemin relatif ou absolu (recommandé), mais dans un répertoire non synchronisé (par masque ou hors du chemin du partage).\nSur la même partition ou système de fichiers (recommandé).", "Pause": "Pause", diff --git a/man/stdiscosrv.1 b/man/stdiscosrv.1 index 7d02b9e84..5f86075e8 100644 --- a/man/stdiscosrv.1 +++ b/man/stdiscosrv.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "STDISCOSRV" "1" "Mar 09, 2021" "v1" "Syncthing" +.TH "STDISCOSRV" "1" "Mar 11, 2021" "v1" "Syncthing" .SH NAME stdiscosrv \- Syncthing Discovery Server . diff --git a/man/strelaysrv.1 b/man/strelaysrv.1 index adbfd5afc..0a9d20386 100644 --- a/man/strelaysrv.1 +++ b/man/strelaysrv.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "STRELAYSRV" "1" "Mar 09, 2021" "v1" "Syncthing" +.TH "STRELAYSRV" "1" "Mar 11, 2021" "v1" "Syncthing" .SH NAME strelaysrv \- Syncthing Relay Server . diff --git a/man/syncthing-bep.7 b/man/syncthing-bep.7 index 66aae6941..958ab5f76 100644 --- a/man/syncthing-bep.7 +++ b/man/syncthing-bep.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-BEP" "7" "Mar 09, 2021" "v1" "Syncthing" +.TH "SYNCTHING-BEP" "7" "Mar 11, 2021" "v1" "Syncthing" .SH NAME syncthing-bep \- Block Exchange Protocol v1 . diff --git a/man/syncthing-config.5 b/man/syncthing-config.5 index 8f66a92b2..60035ee94 100644 --- a/man/syncthing-config.5 +++ b/man/syncthing-config.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-CONFIG" "5" "Mar 09, 2021" "v1" "Syncthing" +.TH "SYNCTHING-CONFIG" "5" "Mar 11, 2021" "v1" "Syncthing" .SH NAME syncthing-config \- Syncthing Configuration . @@ -100,7 +100,16 @@ currently on disk and available from peers. .UNINDENT .SH CONFIG FILE FORMAT .sp -The following shows an example of the default configuration file (IDs will differ): +The following shows an example of a default configuration file (IDs will differ): +.sp +\fBNOTE:\fP +.INDENT 0.0 +.INDENT 3.5 +The config examples are present for illustration. Do \fBnot\fP copy them +entirely to use as your config. They are likely out\-of\-date and the values +may no longer correspond to the defaults. +.UNINDENT +.UNINDENT .INDENT 0.0 .INDENT 3.5 .sp @@ -148,8 +157,7 @@ The following shows an example of the default configuration file (IDs will diffe - tcp://0.0.0.0:8384 - dynamic+https://relays.syncthing.net/endpoint + default default true true @@ -820,8 +828,7 @@ Skip verification (true or false). .nf .ft C - tcp://0.0.0.0:8384 - dynamic+https://relays.syncthing.net/endpoint + default default true true diff --git a/man/syncthing-device-ids.7 b/man/syncthing-device-ids.7 index c3ca91d4d..ab212844e 100644 --- a/man/syncthing-device-ids.7 +++ b/man/syncthing-device-ids.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-DEVICE-IDS" "7" "Mar 09, 2021" "v1" "Syncthing" +.TH "SYNCTHING-DEVICE-IDS" "7" "Mar 11, 2021" "v1" "Syncthing" .SH NAME syncthing-device-ids \- Understanding Device IDs . diff --git a/man/syncthing-event-api.7 b/man/syncthing-event-api.7 index 0d6e2247c..d066b28d5 100644 --- a/man/syncthing-event-api.7 +++ b/man/syncthing-event-api.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-EVENT-API" "7" "Mar 09, 2021" "v1" "Syncthing" +.TH "SYNCTHING-EVENT-API" "7" "Mar 11, 2021" "v1" "Syncthing" .SH NAME syncthing-event-api \- Event API . diff --git a/man/syncthing-faq.7 b/man/syncthing-faq.7 index 18ece5b76..d318aa18d 100644 --- a/man/syncthing-faq.7 +++ b/man/syncthing-faq.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-FAQ" "7" "Mar 09, 2021" "v1" "Syncthing" +.TH "SYNCTHING-FAQ" "7" "Mar 11, 2021" "v1" "Syncthing" .SH NAME syncthing-faq \- Frequently Asked Questions . diff --git a/man/syncthing-globaldisco.7 b/man/syncthing-globaldisco.7 index fe9adb548..c83c46b53 100644 --- a/man/syncthing-globaldisco.7 +++ b/man/syncthing-globaldisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-GLOBALDISCO" "7" "Mar 09, 2021" "v1" "Syncthing" +.TH "SYNCTHING-GLOBALDISCO" "7" "Mar 11, 2021" "v1" "Syncthing" .SH NAME syncthing-globaldisco \- Global Discovery Protocol v3 . diff --git a/man/syncthing-localdisco.7 b/man/syncthing-localdisco.7 index 93cbb5ec6..4b8ba9f15 100644 --- a/man/syncthing-localdisco.7 +++ b/man/syncthing-localdisco.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-LOCALDISCO" "7" "Mar 09, 2021" "v1" "Syncthing" +.TH "SYNCTHING-LOCALDISCO" "7" "Mar 11, 2021" "v1" "Syncthing" .SH NAME syncthing-localdisco \- Local Discovery Protocol v4 . diff --git a/man/syncthing-networking.7 b/man/syncthing-networking.7 index 5166f06a1..f6945e0ac 100644 --- a/man/syncthing-networking.7 +++ b/man/syncthing-networking.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-NETWORKING" "7" "Mar 09, 2021" "v1" "Syncthing" +.TH "SYNCTHING-NETWORKING" "7" "Mar 11, 2021" "v1" "Syncthing" .SH NAME syncthing-networking \- Firewall Setup . diff --git a/man/syncthing-relay.7 b/man/syncthing-relay.7 index 31160cdd4..6a3bae6d6 100644 --- a/man/syncthing-relay.7 +++ b/man/syncthing-relay.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-RELAY" "7" "Mar 09, 2021" "v1" "Syncthing" +.TH "SYNCTHING-RELAY" "7" "Mar 11, 2021" "v1" "Syncthing" .SH NAME syncthing-relay \- Relay Protocol v1 . diff --git a/man/syncthing-rest-api.7 b/man/syncthing-rest-api.7 index e3a781266..784914c86 100644 --- a/man/syncthing-rest-api.7 +++ b/man/syncthing-rest-api.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-REST-API" "7" "Mar 09, 2021" "v1" "Syncthing" +.TH "SYNCTHING-REST-API" "7" "Mar 11, 2021" "v1" "Syncthing" .SH NAME syncthing-rest-api \- REST API . diff --git a/man/syncthing-security.7 b/man/syncthing-security.7 index 9f6d45455..6680d1d69 100644 --- a/man/syncthing-security.7 +++ b/man/syncthing-security.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-SECURITY" "7" "Mar 09, 2021" "v1" "Syncthing" +.TH "SYNCTHING-SECURITY" "7" "Mar 11, 2021" "v1" "Syncthing" .SH NAME syncthing-security \- Security Principles . diff --git a/man/syncthing-stignore.5 b/man/syncthing-stignore.5 index 63a80ee28..a7c987cda 100644 --- a/man/syncthing-stignore.5 +++ b/man/syncthing-stignore.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-STIGNORE" "5" "Mar 09, 2021" "v1" "Syncthing" +.TH "SYNCTHING-STIGNORE" "5" "Mar 11, 2021" "v1" "Syncthing" .SH NAME syncthing-stignore \- Prevent files from being synchronized to other nodes . diff --git a/man/syncthing-versioning.7 b/man/syncthing-versioning.7 index eec73a811..598de6b66 100644 --- a/man/syncthing-versioning.7 +++ b/man/syncthing-versioning.7 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING-VERSIONING" "7" "Mar 09, 2021" "v1" "Syncthing" +.TH "SYNCTHING-VERSIONING" "7" "Mar 11, 2021" "v1" "Syncthing" .SH NAME syncthing-versioning \- Keep automatic backups of deleted files by other nodes . @@ -179,7 +179,8 @@ $ /Users/jb/bin/onlylatest.sh /Users/jb/Sync docs/letter.txt The script will then move the file in question to \fB~/.trashcan/docs/letter.txt\fP, replacing any previous version of that letter that may already have been there. -.SS Example for Windows +.SS Examples for Windows +.SS Move to a given folder using the command prompt (CMD) .sp On Windows we can use a batch script to perform the same “trash can”\-like behavior as mentioned above. I created the following script and saved it as @@ -215,8 +216,72 @@ move /Y "%FOLDER_PATH%\e%FILE_PATH%" "%VERSIONS_PATH%\e%FILE_PATH%" .UNINDENT .UNINDENT .sp -Finally, I set \fBC:\eUsers\emfrnd\eScripts\eonlylatest.bat %FOLDER_PATH% %FILE_PATH%\fP -as the command name in Syncthing. +Finally, I set \fB"C:\eUsers\emfrnd\eScripts\eonlylatest.bat" "%FOLDER_PATH%" +"%FILE_PATH%"\fP as the command name in Syncthing. +.SS Move to the Recycle Bin using PowerShell +.sp +We can use PowerShell to send files directly to the Recycle Bin, which +mimics the behaviour of deleting them using the Windows Explorer. +Firstly, create the following script and save it in your preferred +location, e.g. \fBC:\eUsers\eUser\eScripts\eSendToRecycleBin.ps1\fP\&. +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +# PowerShell has no native method to recycle files, so we use Visual +# Basic to perform the operation. If succeeded, we also include the +# recycled file in the Syncthing\(aqs DEBUG output. +Add\-Type \-AssemblyName Microsoft.VisualBasic +[Microsoft.VisualBasic.FileIO.FileSystem]::DeleteFile($args,\(aqOnlyErrorDialogs\(aq,\(aqSendToRecycleBin\(aq) +if ($?) { + Write\-Output ("Recycled " + $args + ".") +} +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +Alternatively, the script can be expanded to send only deleted files to +the Recycle Bin, and permanently delete modified ones, which makes it +more consistent with how the Explorer works. +.INDENT 0.0 +.INDENT 3.5 +.sp +.nf +.ft C +# PowerShell has no native method to recycle files, so we use Visual +# Basic to perform the operation. +Add\-Type \-AssemblyName Microsoft.VisualBasic + +# We need to test if a Syncthing .tmp file exists. If it does, we assume +# a modification and delete the existing file. If if does not, we assume +# a deletion and recycle the current file. If succeeded, we also include +# the deleted/recycled file in the Syncthing\(aqs DEBUG output. +if (Test\-Path \-LiteralPath ((Split\-Path \-Path $args) + "\e~syncthing~" + (Split\-Path \-Path $args \-Leaf) + ".tmp")) { + [Microsoft.VisualBasic.FileIO.FileSystem]::DeleteFile($args,\(aqOnlyErrorDialogs\(aq,\(aqDeletePermanently\(aq) + if ($?) { + Write\-Output ("Deleted " + $args + ".") + } +} else { + [Microsoft.VisualBasic.FileIO.FileSystem]::DeleteFile($args,\(aqOnlyErrorDialogs\(aq,\(aqSendToRecycleBin\(aq) + if ($?) { + Write\-Output ("Recycled " + $args + ".") + } +} +.ft P +.fi +.UNINDENT +.UNINDENT +.sp +Finally, we set the command name in Syncthing to \fBpowershell.exe +\-ExecutionPolicy Bypass \-File "C:\eUsers\eUser\eScripts\eSendToRecycleBin.ps1" +"%FOLDER_PATH%\e%FILE_PATH%"\fP\&. +.sp +The only caveat that you should be aware of is that if your Syncthing +folder is located on a portable storage, such as a USB stick, or if you +have the Recycle Bin disabled, then the script will end up deleting all +files permanently. .SH AUTHOR The Syncthing Authors .SH COPYRIGHT diff --git a/man/syncthing.1 b/man/syncthing.1 index 0e7698553..6b6698f09 100644 --- a/man/syncthing.1 +++ b/man/syncthing.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH "SYNCTHING" "1" "Mar 09, 2021" "v1" "Syncthing" +.TH "SYNCTHING" "1" "Mar 11, 2021" "v1" "Syncthing" .SH NAME syncthing \- Syncthing .