diff --git a/plinth/modules/cockpit/__init__.py b/plinth/modules/cockpit/__init__.py index dfc59a977..f6c8f2c38 100644 --- a/plinth/modules/cockpit/__init__.py +++ b/plinth/modules/cockpit/__init__.py @@ -54,11 +54,11 @@ description = [ 'required. A web based terminal for console operations is also ' 'available.'), box_name=_(cfg.box_name)), format_lazy( - _('When enabled, Cockpit will be available from ' - '/_cockpit/ path on the web server. It can be accessed by ' - 'any user on {box_name} belonging to ' - 'the admin group.'), box_name=_(cfg.box_name), - users_url=reverse_lazy('users:index')), + _('When enabled, Cockpit will be available from /_cockpit/ path on the web server. It ' + 'can be accessed by any user on ' + '{box_name} belonging to the admin group.'), + box_name=_(cfg.box_name), users_url=reverse_lazy('users:index')), ] manual_page = 'Cockpit' diff --git a/plinth/modules/deluge/__init__.py b/plinth/modules/deluge/__init__.py index 797d51b6a..08fda23f9 100644 --- a/plinth/modules/deluge/__init__.py +++ b/plinth/modules/deluge/__init__.py @@ -43,9 +43,9 @@ short_description = _('BitTorrent Web Client') description = [ _('Deluge is a BitTorrent client that features a Web UI.'), _('When enabled, the Deluge web client will be available from ' - '/deluge path on the web server. The ' - 'default password is \'deluge\', but you should log in and change ' - 'it immediately after enabling this service.') + '/deluge path on the web ' + 'server. The default password is \'deluge\', but you should log in and ' + 'change it immediately after enabling this service.') ] group = ('bit-torrent', _('Download files using BitTorrent applications')) diff --git a/plinth/modules/gitweb/templates/gitweb_configure.html b/plinth/modules/gitweb/templates/gitweb_configure.html index 8a61a4b92..af7a3384f 100644 --- a/plinth/modules/gitweb/templates/gitweb_configure.html +++ b/plinth/modules/gitweb/templates/gitweb_configure.html @@ -85,6 +85,7 @@ {{ repo.name }} {% else %} {{ repo.name }} diff --git a/plinth/modules/ikiwiki/__init__.py b/plinth/modules/ikiwiki/__init__.py index 64e0a1a8a..f7ecd9adc 100644 --- a/plinth/modules/ikiwiki/__init__.py +++ b/plinth/modules/ikiwiki/__init__.py @@ -46,8 +46,9 @@ description = [ _('ikiwiki is a simple wiki and blog application. It supports ' 'several lightweight markup languages, including Markdown, and ' 'common blogging functionality such as comments and RSS feeds. ' - 'When enabled, the blogs and wikis will be available ' - 'at /ikiwiki (once created).'), + 'When enabled, the blogs and wikis will be available at ' + '/ikiwiki ' + '(once created).'), format_lazy( _('Only {box_name} users in the admin group can create ' 'and manage blogs and wikis, but any user in the wiki ' diff --git a/plinth/modules/ikiwiki/templates/ikiwiki_configure.html b/plinth/modules/ikiwiki/templates/ikiwiki_configure.html index 7f7eaf133..6c9a62dc2 100644 --- a/plinth/modules/ikiwiki/templates/ikiwiki_configure.html +++ b/plinth/modules/ikiwiki/templates/ikiwiki_configure.html @@ -51,6 +51,7 @@ {{ site.1 }} diff --git a/plinth/modules/repro/__init__.py b/plinth/modules/repro/__init__.py index d1c105d41..853f2717e 100644 --- a/plinth/modules/repro/__init__.py +++ b/plinth/modules/repro/__init__.py @@ -53,11 +53,11 @@ description = [ ' ' 'CSipSimple (for Android phones).'), _('Note: Before using repro, domains and users will ' - 'need to be configured using the ' - 'web-based configuration panel. Users in the admin group ' - 'will be able to log in to the repro configuration panel. After setting ' - 'the domain, it is required to restart the repro service. Disable the ' - 'service and re-enable it.'), + 'need to be configured using the web-based configuration panel. Users in ' + 'the admin group will be able to log in to the repro ' + 'configuration panel. After setting the domain, it is required to ' + 'restart the repro service. Disable the service and re-enable it.'), ] clients = clients diff --git a/plinth/modules/roundcube/__init__.py b/plinth/modules/roundcube/__init__.py index d5bd5ac2f..fcc207ea6 100644 --- a/plinth/modules/roundcube/__init__.py +++ b/plinth/modules/roundcube/__init__.py @@ -42,8 +42,8 @@ description = [ 'full functionality you expect from an email client, including ' 'MIME support, address book, folder manipulation, message ' 'searching and spell checking.'), - _('You can access Roundcube from ' - '/roundcube. Provide the username and password of the email ' + _('You can access Roundcube from /roundcube. Provide the username and password of the email ' 'account you wish to access followed by the domain name of the ' 'IMAP server for your email provider, like imap.example.com' '. For IMAP over SSL (recommended), fill the server field ' diff --git a/plinth/modules/shaarli/__init__.py b/plinth/modules/shaarli/__init__.py index e7871af5a..dbe8b6f6d 100644 --- a/plinth/modules/shaarli/__init__.py +++ b/plinth/modules/shaarli/__init__.py @@ -37,10 +37,10 @@ short_description = _('Bookmarks') description = [ _('Shaarli allows you to save and share bookmarks.'), - _('When enabled, Shaarli will be available from ' - '/shaarli path on the web server. Note that Shaarli only supports a ' - 'single user account, which you will need to setup on the initial ' - 'visit.'), + _('When enabled, Shaarli will be available from /shaarli path on the web server. Note that ' + 'Shaarli only supports a single user account, which you will need to ' + 'setup on the initial visit.'), ] clients = clients diff --git a/plinth/modules/syncthing/__init__.py b/plinth/modules/syncthing/__init__.py index 915ba4f6d..da7742810 100644 --- a/plinth/modules/syncthing/__init__.py +++ b/plinth/modules/syncthing/__init__.py @@ -55,8 +55,9 @@ description = [ 'folders. The web interface on {box_name} is only available for ' 'users belonging to the "admin" group.'), box_name=_(cfg.box_name)), _('When enabled, Syncthing\'s web interface will be available from ' - '/syncthing. Desktop and mobile clients are ' - 'also available.'), + '/syncthing. ' + 'Desktop and mobile clients are also ' + 'available.'), ] clients = clients diff --git a/plinth/modules/transmission/__init__.py b/plinth/modules/transmission/__init__.py index 7f9a0cd69..1e43e832e 100644 --- a/plinth/modules/transmission/__init__.py +++ b/plinth/modules/transmission/__init__.py @@ -46,7 +46,8 @@ description = [ _('BitTorrent is a peer-to-peer file sharing protocol. ' 'Transmission daemon handles Bitorrent file sharing. Note that ' 'BitTorrent is not anonymous.'), - _('Access the web interface at /transmission.') + _('Access the web interface at ' + '/transmission.') ] clients = clients diff --git a/plinth/modules/ttrss/__init__.py b/plinth/modules/ttrss/__init__.py index fa5ce8dcc..23a00f6d3 100644 --- a/plinth/modules/ttrss/__init__.py +++ b/plinth/modules/ttrss/__init__.py @@ -50,12 +50,14 @@ description = [ 'close to a real desktop application as possible.'), format_lazy( _('When enabled, Tiny Tiny RSS will be available from /tt-rss path on the web server. It can be accessed by ' - 'any user with a {box_name} login.'), + 'rss" data-turbolinks="false">/tt-rss path on the web server. ' + 'It can be accessed by any user with a ' + '{box_name} login.'), box_name=_(cfg.box_name), users_url=reverse_lazy('users:index')), format_lazy( _('When using a mobile or desktop application for Tiny Tiny RSS, use ' - 'the URL /tt-rss-app for connecting.')) + 'the URL ' + '/tt-rss-app for connecting.')) ] clients = clients