Merge remote-tracking branch 'upstream/master' into curl-smtp

2 files changed, 45 insertions, 1 deletions

diff --git a/doc/snac.1 b/doc/snac.1
index 327e071..601ce6d 100644
--- a/doc/snac.1
+++ b/doc/snac.1
@@ -78,8 +78,17 @@ Fediverse identifier to follow.
 .It Boost (by URL)
 Fill the input area with the URL of a Fediverse note to be
 boosted.
+.It Like (by URL)
+Fill the input area with the URL of a Fediverse note to be
+liked.
 .It User setup...
 This option opens the user setup dialog.
+.It Followed hashtags...
+Enter here the list of hashtags you want to follow, one
+per line, with or without the # symbol.
+.It Blocked hashtags...
+Enter here the list of hashtags you want to block, one
+per line, with or without the # symbol.
 .El
 .Pp
 The user setup dialog allows some user information to be
@@ -151,6 +160,9 @@ approved or discarded.
 If this toggle is set, the number of followers and following
 accounts are made public (this is only the number; the specific
 lists of accounts are never published).
+.It Web interface language
+If the administrator has installed any language file, it
+can be selected here.
 .It Password
 Write the same string in these two fields to change your
 password. Don't write anything if you don't want to do this.
@@ -256,7 +268,8 @@ argument is -e, the external editor defined by the EDITOR
 environment variable will be invoked to prepare a message; if
 it's - (a lonely hyphen), the post content will be read from stdin.
 The rest of command line arguments are treated as media files to be
-attached to the post.
+attached to the post. The LANG environment variable (if defined) is used
+as the post language.
 .It Cm note_unlisted Ar basedir Ar uid Ar text Op file file ...
 Like the previous one, but creates an "unlisted" (or "quiet public") post.
 .It Cm note_mention Ar basedir Ar uid Ar text Op file file ...
@@ -395,6 +408,8 @@ variable. Set it to an integer value. The higher, the deeper in meaningless
 verbiage you'll find yourself into.
 .It Ev EDITOR
 The user-preferred interactive text editor to prepare messages.
+.It Ev LANG
+The language of the post when sending messages.
 .El
 .Sh SEE ALSO
 .Xr snac 5 ,
diff --git a/doc/snac.8 b/doc/snac.8
index f1e5590..7594d82 100644
--- a/doc/snac.8
+++ b/doc/snac.8
@@ -264,6 +264,9 @@ The maximum number of entries (posts) to be returned in user RSS feeds and outbo
 (default: 20).
 .It Ic max_attachments
 The maximum number of attachments per post (default: 4).
+.It Ic enable_svg
+Since version 2.73, SVG image attachments are hidden by default; you can enable
+them by setting this value to true.
 .El
 .Pp
 You must restart the server to make effective these changes.
@@ -617,6 +620,32 @@ hashtags.
 Please take note that subscribing to relays can increase the traffic towards your instance
 significantly. In any case, lowering the "Maximum days to keep posts" value for the relay
 special user is recommended (e.g. setting to just 1 day).
+.Ss Web interface language
+Since version 2.73, the web UI can be localized via simple .po files (they are directly
+parsed, no support for gettext is needed).
+.Pp
+No language file is installed by default; the administrator must copy any desired .po files
+to the
+.Pa lang/
+subdirectory in the base directory. Once the server is restarted, users can select the
+new language from the user settings. The
+.Nm
+source distribution may include .po files in the
+.Pa po/
+subdirectory. You don't need to copy the English language one, as it's the default.
+.Pp
+To create new language files, create a copy of
+.Pa po/en.po ,
+rename it to a reasonable value like
+.Pa pl.po
+or
+.Pa pt_BR.po ,
+change the translator in the header to yourself and fill the msgstr strings with your
+translation. If you have any doubt on how to modify .po files, there are many tutorials
+out there. If you want your language file to be included in the standard
+.Nm
+distribution, please send me a link to it via the Fediverse to @grunfink@comam.es
+or make a PR via the Git repository.
 .Sh ENVIRONMENT
 .Bl -tag -width Ds
 .It Ev DEBUG