Jo-Philipp Wich [Mon, 3 Jun 2019 14:49:10 +0000 (16:49 +0200)]
themes: don't reset theme on package upgrades
Fixes: #2743
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Mon, 3 Jun 2019 14:34:06 +0000 (16:34 +0200)]
Merge pull request #2742 from Ansuel/odhcp-lease
luci-base: handle dhcp lease from odhcpd
Ansuel Smith [Sun, 2 Jun 2019 20:37:31 +0000 (22:37 +0200)]
luci-base: handle dhcp lease from odhcpd
Currently only the dnsmasq lease file is read for hostname hint. If someone use only odhcpd as dhcp daemon the hostname resolution on wifi_assoc list is broken.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Ansuel Smith [Sun, 2 Jun 2019 20:33:02 +0000 (22:33 +0200)]
luci-base: adds duid_to_mac to sys.lua
Move duid_to_mac function from status.lua to sys.lua.
Implement translation from DUID-LL without header to MAC
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Jo-Philipp Wich [Fri, 31 May 2019 18:09:41 +0000 (20:09 +0200)]
build: i18n-scan.pl: properly handle bracket-quoted strings
Fixes: #2738
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Hannu Nyman [Wed, 29 May 2019 16:29:11 +0000 (19:29 +0300)]
Merge pull request #2733 from castillofrancodamian/samba4
luci-app-samba4: Update Spanish translation
Hannu Nyman [Wed, 29 May 2019 16:28:55 +0000 (19:28 +0300)]
Merge pull request #2734 from castillofrancodamian/tinyproxy
luci-app-tinyproxy: Update Spanish translation
Hannu Nyman [Wed, 29 May 2019 16:28:19 +0000 (19:28 +0300)]
Merge pull request #2735 from castillofrancodamian/statistics
luci-app-statistics: Update Spanish translation
Hannu Nyman [Wed, 29 May 2019 16:27:09 +0000 (19:27 +0300)]
Merge pull request #2394 from gyr0tron/privoxy_hindi
luci-app-privoxy: Added Hindi translation
Gyrotron [Wed, 26 Dec 2018 08:49:08 +0000 (14:19 +0530)]
Added privoxy Hindi translations
Signed-off-by: Simmar Kalsi <simmarkalsi@gmail.com>
Florian Eckert [Wed, 29 May 2019 09:10:19 +0000 (11:10 +0200)]
Merge pull request #2670 from TDT-AG/pr/
20190410-luci-mod-network
luci-mod-network: move auto option to general tab
Franco Castillo [Tue, 28 May 2019 19:08:31 +0000 (16:08 -0300)]
luci-app-statistics: Update Spanish translation
Update Spanish translation
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Florian Eckert [Tue, 28 May 2019 19:03:43 +0000 (21:03 +0200)]
Merge pull request #2673 from jose1711/mjpg-streamer-link
luci-app-mjpg-streamer: add link option
Florian Eckert [Tue, 28 May 2019 18:57:34 +0000 (20:57 +0200)]
Merge pull request #2391 from Matthias84/patch-4
luci-app-uhttpd: German translation
Franco Castillo [Tue, 28 May 2019 18:49:24 +0000 (15:49 -0300)]
luci-app-tinyproxy: Update Spanish translation
Update Spanish translation
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Franco Castillo [Tue, 28 May 2019 18:35:56 +0000 (15:35 -0300)]
luci-app-samba4: Update Spanish translation
Update Spanish translation
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Dirk Brenken [Tue, 28 May 2019 14:18:44 +0000 (16:18 +0200)]
Merge pull request #2725 from EricLuehrsen/unbound_view
luci-app-unbound: match dependencies with unbound package
Florian Eckert [Tue, 28 May 2019 06:35:01 +0000 (08:35 +0200)]
Merge pull request #2732 from castillofrancodamian/hd
luci-app-hd-idle: Update Spanish translation
Franco Castillo [Tue, 28 May 2019 03:48:50 +0000 (00:48 -0300)]
luci-app-hd-idle: Update Spanish translation
Update Spanish translation
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Florian Eckert [Sat, 25 May 2019 19:43:50 +0000 (21:43 +0200)]
Merge pull request #2174 from rosysong/lease-status
luci-base: drop ipv6 lease status when IPV6 is not support
Eric Luehrsen [Fri, 24 May 2019 00:43:19 +0000 (20:43 -0400)]
luci-app-unbound: match dependencies with unbound package
Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
Florian Eckert [Mon, 20 May 2019 16:24:09 +0000 (18:24 +0200)]
Merge pull request #2691 from sumpfralle/patch-1
Various improvements of the German translation
Lars Kruse [Sun, 5 May 2019 18:43:22 +0000 (20:43 +0200)]
luci-base: Update German translation
The following changes are included:
* properly handle "Präfix" as neuter
* add missing hyphens to many appearances of "Präfix"
* fix spelling
* add few missing translations
Signed-off-by: Lars Kruse <devel@sumpfralle.de>
Hannu Nyman [Fri, 17 May 2019 13:56:26 +0000 (16:56 +0300)]
Merge pull request #2716 from castillofrancodamian/base
luci-base: Update Spanish translation
Florian Eckert [Fri, 17 May 2019 07:04:05 +0000 (09:04 +0200)]
Merge pull request #2719 from castillofrancodamian/aria2
luci-app-aria2: Update Spanish translation
Florian Eckert [Fri, 17 May 2019 07:03:20 +0000 (09:03 +0200)]
Merge pull request #2718 from castillofrancodamian/firewall
luci-app-firewall: Update Spanish translation
Florian Eckert [Fri, 17 May 2019 07:01:56 +0000 (09:01 +0200)]
Merge pull request #2717 from sotux/master-luci-base-zh_CN
luci-base: zh_CN: update Simplified Chinese translation
Franco Castillo [Fri, 17 May 2019 01:55:12 +0000 (22:55 -0300)]
luci-app-aria2: Update Spanish translation
Update Spanish translation
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Franco Castillo [Fri, 17 May 2019 01:32:26 +0000 (22:32 -0300)]
luci-app-firewall: Update Spanish translation
Update Spanish translation
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Zheng Qian [Fri, 17 May 2019 01:21:46 +0000 (09:21 +0800)]
luci-base: zh_CN: update Simplified Chinese translation
Signed-off-by: Zheng Qian <sotux82@gmail.com>
Franco Castillo [Thu, 16 May 2019 23:14:14 +0000 (20:14 -0300)]
luci-base: Update Spanish translation
Update Spanish translation
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Hannu Nyman [Thu, 16 May 2019 18:48:26 +0000 (21:48 +0300)]
Merge pull request #2715 from castillofrancodamian/mjpg
luci-app-mjpg-streamer: Add Spanish translation
Franco Castillo [Thu, 16 May 2019 18:43:52 +0000 (15:43 -0300)]
luci-app-mjpg-streamer: Add Spanish translation
Add Spanish translation
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Hannu Nyman [Thu, 16 May 2019 18:33:32 +0000 (21:33 +0300)]
Merge pull request #2714 from castillofrancodamian/watchcat
luci-app-watchcat: Update Spanish translation
Hannu Nyman [Thu, 16 May 2019 18:33:08 +0000 (21:33 +0300)]
Merge pull request #2713 from castillofrancodamian/opkg
luci-app-opkg: Update Spanish translation
Franco Castillo [Thu, 16 May 2019 18:28:59 +0000 (15:28 -0300)]
luci-app-watchcat: Update Spanish translation
Update Spanish translation
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Franco Castillo [Thu, 16 May 2019 18:24:52 +0000 (15:24 -0300)]
luci-app-opkg: Update Spanish translation
Update Spanish translation
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Dirk Brenken [Thu, 16 May 2019 15:08:44 +0000 (17:08 +0200)]
Merge pull request #2711 from dibdot/banip
luci-app-banip: change maxqueue default / sync with banIP 0.1.1
Florian Eckert [Thu, 16 May 2019 09:46:58 +0000 (11:46 +0200)]
Merge pull request #2703 from castillofrancodamian/polipo
luci-app-polipo: Update Spanish translation
Florian Eckert [Thu, 16 May 2019 09:46:13 +0000 (11:46 +0200)]
Merge pull request #2707 from castillofrancodamian/shadowsocks-libev
luci-app-shadowsocks-libev: Udpate Spanish translation
Florian Eckert [Thu, 16 May 2019 09:36:30 +0000 (11:36 +0200)]
Merge pull request #2709 from castillofrancodamian/nlbwmon
luci-app-nlbwmon: Add Spanish translation
Florian Eckert [Thu, 16 May 2019 09:33:40 +0000 (11:33 +0200)]
Merge pull request #2705 from castillofrancodamian/adblock
luci-app-adblock: Update Spanish translation
Florian Eckert [Thu, 16 May 2019 09:33:01 +0000 (11:33 +0200)]
Merge pull request #2710 from castillofrancodamian/ddns
luci-app-ddns: Update Spanish translation
Dirk Brenken [Thu, 16 May 2019 08:39:48 +0000 (10:39 +0200)]
luci-app-banip: change maxqueue default / sync with banIP 0.1.1
* change maxqueue default to '4' to reduce the overall system load
Signed-off-by: Dirk Brenken <dev@brenken.org>
Franco Castillo [Wed, 15 May 2019 23:11:45 +0000 (20:11 -0300)]
luci-app-ddns: Update Spansih translation
Update Spansih translation
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Franco Castillo [Wed, 15 May 2019 22:18:23 +0000 (19:18 -0300)]
luci-app-nlbwmon: Add Spanish translation
Add Spanish translation
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Franco Castillo [Wed, 15 May 2019 21:27:19 +0000 (18:27 -0300)]
luci-app-shadowsocks-libev: Udpate Spanish translation
Udpate Spanish translation
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Franco Castillo [Wed, 15 May 2019 20:58:11 +0000 (17:58 -0300)]
luci-app-adblock: Update Spanish translation
Update Spanish translation
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Franco Castillo [Wed, 15 May 2019 20:32:48 +0000 (17:32 -0300)]
luci-app-polipo: Update Spanish translation
Update Spanish translation
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Florian Eckert [Wed, 15 May 2019 19:27:57 +0000 (21:27 +0200)]
Merge pull request #2702 from castillofrancodamian/ddns
luci-app-ddns: Udpate Spanish translation
Florian Eckert [Wed, 15 May 2019 19:27:00 +0000 (21:27 +0200)]
Merge pull request #2701 from castillofrancodamian/wol
luci-app-wol: Update Spanish translation
Florian Eckert [Wed, 15 May 2019 19:26:30 +0000 (21:26 +0200)]
Merge pull request #2700 from castillofrancodamian/firewall
luci-app-firewall: Update Spanish translation
Florian Eckert [Wed, 15 May 2019 19:26:00 +0000 (21:26 +0200)]
Merge pull request #2699 from castillofrancodamian/base
luci-base: Update Spanish translation
Franco Castillo [Wed, 15 May 2019 04:07:56 +0000 (01:07 -0300)]
luci-app-ddns: Udpate Spanish translation
Udpate Spanish translation
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Franco Castillo [Wed, 15 May 2019 03:41:57 +0000 (00:41 -0300)]
luci-app-wol: Update Spanish translation
Update Spanish translation
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Franco Castillo [Wed, 15 May 2019 03:35:54 +0000 (00:35 -0300)]
luci-app-firewall: Update Spanish translation
Update Spanish translation
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Franco Castillo [Wed, 15 May 2019 03:25:07 +0000 (00:25 -0300)]
luci-base: Update Spanish translation
Update Spanish translation
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Matthias84 [Sun, 23 Dec 2018 12:07:36 +0000 (13:07 +0100)]
luci-app-uhttpd German translation
German translation by Matthias Meißer
Signed-off-by: Matthias Meißer <digi_c@arcor.de>
Fabian Schmid-Michels [Wed, 2 Jan 2019 23:29:59 +0000 (00:29 +0100)]
luci-app-statistics: change nut voltage graph combines view.
This change splits the graph into two graphs like in apcups and makes it so
possible to see variations in AC Input/Output voltages. Battery charge and
load are indepentent variables. This change also overlays them and display
them as simply two lines. Battery temperature is also displayed as a line now,
as an area under a temperature line makes no sense. Also removed some empty
lines.
Closes: #2417
Signed-off-by: Fabian Schmid-Michels <mail@wohnheimnetz-bielefeld.de>
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Florian Eckert [Tue, 14 May 2019 06:17:22 +0000 (08:17 +0200)]
Merge pull request #2514 from sandinak/feature_luci_stats_multiple_ups
luci-app-statistics: adding ability for luci_stats config to have multiple UPS's
Florian Eckert [Tue, 14 May 2019 06:10:14 +0000 (08:10 +0200)]
Merge pull request #2697 from musashino205/l10n/base-upd-ja
luci-base: update Japanese translation
INAGAKI Hiroshi [Mon, 13 May 2019 09:58:37 +0000 (18:58 +0900)]
luci-base: update Japanese translation
Updated Japanese translations.
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
INAGAKI Hiroshi [Mon, 13 May 2019 09:18:52 +0000 (18:18 +0900)]
i18n: sync translations
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Jo-Philipp Wich [Thu, 9 May 2019 11:26:10 +0000 (13:26 +0200)]
Merge pull request #2687 from HenryGiraldo/master
luci-mod-admin-full: add dependency for channel auto
Yousong Zhou [Thu, 9 May 2019 06:00:52 +0000 (06:00 +0000)]
luci-app-shadowsocks-libev: move plugin options to server sections
In this change, plugin options are moved from component settings to
only server settings. This should make the configuration easier. And
it will be less error-prone as it's impossible now for users to
inconsisitent plugin settings for instances referring to the same remote
server
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Jo-Philipp Wich [Tue, 7 May 2019 06:54:23 +0000 (08:54 +0200)]
luci-mod-admin-network: fix VLAN "add" button for empty switches
Fixes OpenWrt FS#2270.
Ref: https://bugs.openwrt.org/index.php?do=details&task_id=2270
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Yousong Zhou [Mon, 6 May 2019 15:22:06 +0000 (15:22 +0000)]
luci-app-shadowsocks-libev: i18n-sync.sh and update translation
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Yousong Zhou [Mon, 6 May 2019 15:16:59 +0000 (15:16 +0000)]
luci-app-shadowsocks-libev: allow setting plugin options
Reference: https://github.com/openwrt/packages/issues/8903
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Yousong Zhou [Tue, 22 Jan 2019 06:29:24 +0000 (06:29 +0000)]
luci-app-shadowsocks-libev: reword base64 -encoding-
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Jo-Philipp Wich [Mon, 6 May 2019 06:22:39 +0000 (08:22 +0200)]
luci-base: remove interface from zone upon deletion
Fixes: #2690
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Hannu Nyman [Sun, 5 May 2019 13:45:00 +0000 (16:45 +0300)]
Merge pull request #2688 from rosysong/rosy-bugs-fix
luci-theme-rosy: fix table overflow on network/switch
yglb [Thu, 2 May 2019 09:05:55 +0000 (17:05 +0800)]
luci-theme-rosy: fix table overflow on network/switch
Signed-off-by: Rosy Song <rosysong@rosinson.com>
Signed-off-by: Yan Lan Shen <yanlan.shen@rosinson.com>
Enrique Giraldo [Tue, 18 Sep 2018 11:43:01 +0000 (13:43 +0200)]
luci-mod-admin-full: add dependency for channel auto
Do not show 'auto' channel option if hostapd is
not compiled with CONFIG_ACS
Signed-off-by: Enrique Giraldo <hgiraldos@gmail.com>
Jo-Philipp Wich [Tue, 30 Apr 2019 07:08:56 +0000 (09:08 +0200)]
luci-app-statistics: escape backslashes as well
Fixes:
bab4a3ef ("luci-app-statistics - allow rrd files to contain :")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Tue, 30 Apr 2019 07:05:16 +0000 (09:05 +0200)]
luci-base: luci.model.network: simplify is_auto()
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Florian Eckert [Tue, 30 Apr 2019 06:47:38 +0000 (08:47 +0200)]
Merge pull request #2657 from msurovcak/msurovcak-statistics-collon
luci-app-statistics - allow rrd files to contain :
Florian Eckert [Tue, 30 Apr 2019 06:22:50 +0000 (08:22 +0200)]
Merge pull request #2620 from TDT-AG/pr/
20190311-luci-mod-system
luci-mod-system: add button to sync with ntp server
Florian Eckert [Thu, 25 Apr 2019 11:28:56 +0000 (13:28 +0200)]
Merge pull request #2119 from TDT-AG/pr/
20180830-fix-iface-status-page
luci-mod-admin-full: add hint to overview page
Florian Eckert [Mon, 11 Mar 2019 09:07:34 +0000 (10:07 +0100)]
luci-mod-network: add auto start hint
Make the information if the interface is started on boot visible on the
interface overview page.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Florian Eckert [Wed, 29 Aug 2018 13:15:10 +0000 (15:15 +0200)]
luci-mod-network: add is_auto option to iface_status
Make interface information is_auto available.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Florian Eckert [Wed, 29 Aug 2018 13:14:27 +0000 (15:14 +0200)]
luci-base: add is_auto function
Add missing is_auto getter function.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Florian Eckert [Wed, 24 Apr 2019 07:40:38 +0000 (09:40 +0200)]
Merge pull request #2443 from TDT-AG/pr/
20190109-luci-mod-system-password
luci-mod-system: add password strength info
jose1711 [Fri, 12 Apr 2019 18:33:04 +0000 (20:33 +0200)]
luci-app-mjpg-streamer: add link option
Signed-off-by: Jose Riha <jose1711@gmail.com>
Jo-Philipp Wich [Tue, 23 Apr 2019 15:29:52 +0000 (17:29 +0200)]
Merge pull request #2681 from dibdot/shadowsocks-fix
luci-app-shadowsocks-libev: fix cidr datatype
Dirk Brenken [Tue, 23 Apr 2019 13:42:53 +0000 (15:42 +0200)]
luci-app-shadowsocks-libev: fix cidr datatype
* add a new 'cidr' alias datatype to fix #2671
Signed-off-by: Dirk Brenken <dev@brenken.org>
Hannu Nyman [Mon, 22 Apr 2019 17:22:08 +0000 (20:22 +0300)]
Merge pull request #2676 from castillofrancodamian/luci
luci-base: Update Spanish translation
Hannu Nyman [Mon, 22 Apr 2019 17:21:44 +0000 (20:21 +0300)]
Merge pull request #2677 from castillofrancodamian/ddns
luci-app-ddns: Update Spanish translation
Hannu Nyman [Mon, 22 Apr 2019 17:21:12 +0000 (20:21 +0300)]
Merge pull request #2678 from castillofrancodamian/firewall
luci-app-firewall: Update Spanish translation
Franco Castillo [Sat, 20 Apr 2019 23:26:33 +0000 (20:26 -0300)]
luci-app-firewall: Update Spanish translation
Update Spanish translation
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Franco Castillo [Sat, 20 Apr 2019 23:16:07 +0000 (20:16 -0300)]
luci-app-ddns: Update Spanish translation
Update Spanish translation
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Franco Castillo [Sat, 20 Apr 2019 23:04:03 +0000 (20:04 -0300)]
luci-base: Update Spanish translation
Update Spanish translation
Signed-off-by: Franco Castillo <castillofrancodamian@gmail.com>
Anton Kikin [Thu, 25 Oct 2018 16:59:40 +0000 (19:59 +0300)]
luci-mod-system: add "KiB" to translatable strings
Also changed original "kiB" to "KiB" in accordance with IEEE 1541-2002.
Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
Jo-Philipp Wich [Fri, 12 Apr 2019 05:39:29 +0000 (07:39 +0200)]
Merge pull request #2509 from shunjou/material-svg
luci-theme-material: icons and other changes
Florian Eckert [Fri, 6 Apr 2018 08:49:16 +0000 (10:49 +0200)]
luci-mod-network: move auto option to general tab
Since openwrt-18.06 the auto option is set/unset if we press
connect/disconnect on the interface page. So I think we should move this
to the general tab so that we see at once if this is started on boot or
not.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Dirk Brenken [Tue, 9 Apr 2019 18:54:13 +0000 (20:54 +0200)]
Merge pull request #2669 from dibdot/travelmate
luci-app-travelmate: sync with update 1.4.5
Dirk Brenken [Tue, 9 Apr 2019 14:57:10 +0000 (16:57 +0200)]
luci-app-travelmate: sync with update 1.4.5
* see https://github.com/openwrt/packages/pull/8637 for reference
Signed-off-by: Dirk Brenken <dev@brenken.org>
Jo-Philipp Wich [Mon, 8 Apr 2019 15:10:09 +0000 (17:10 +0200)]
luci-mod-network: fix bad unicode comma in network.js
Fixes:
5624b36fa ("luci-mod-network: fix page refresh after interface reconnect")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Olli Asikainen [Fri, 8 Feb 2019 14:49:04 +0000 (16:49 +0200)]
luci-mod-status: Remove port suffix where not applicable
Submitted-by: Olli Asikainen <olli.asikainen@gmail.com>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Jo-Philipp Wich [Mon, 8 Apr 2019 07:20:14 +0000 (09:20 +0200)]
Merge pull request #2642 from TDT-AG/pr/
20190329-luci-base
luci-base: add cbi tsection error msg option
Claudio Marelli [Fri, 8 Feb 2019 08:46:40 +0000 (09:46 +0100)]
luci-mod-status: convert bytes into KB / MB / GB on progress bar
Currently on the system status page the the memory usage is shown in kB
only. If you have a system with 1 GB of Ram its hard to read the large
numbers. This automatically formats the byte numbers more human readable
into KB / MB / GB.
Submitted-by: Claudio Marelli <camarelli@gmx.net>
[squash commits, rewrap commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>