From 63cd8da0bbd2ba0cce73ab072af79518d88b98d5 Mon Sep 17 00:00:00 2001
From: gSpot <gspot.x2f@gmail.com>
Date: Fri, 9 Aug 2024 00:10:01 +0300
Subject: [PATCH] Minor fixes.

---
 autoinstall/current/autoinstall.sh                            | 4 ++--
 luci-app-ruantiblock/Makefile                                 | 2 +-
 .../htdocs/luci-static/resources/view/ruantiblock/cron.js     | 2 +-
 luci-app-ruantiblock/po/ru/ruantiblock.po                     | 2 +-
 luci-app-ruantiblock/po/templates/ruantiblock.pot             | 2 +-
 ruantiblock/Makefile                                          | 2 +-
 ruantiblock/files/etc/ruantiblock/fqdn_filter                 | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/autoinstall/current/autoinstall.sh b/autoinstall/current/autoinstall.sh
index 49ce115..47789ed 100755
--- a/autoinstall/current/autoinstall.sh
+++ b/autoinstall/current/autoinstall.sh
@@ -9,9 +9,9 @@ LUA_MODULE=0
 LUCI_APP=1
 
 OWRT_VERSION="current"
-RUAB_VERSION="1.5.0-1"
+RUAB_VERSION="1.5.0-2"
 RUAB_MOD_LUA_VERSION="1.5.0-1"
-RUAB_LUCI_APP_VERSION="1.5.0-r1"
+RUAB_LUCI_APP_VERSION="1.5.0-r2"
 BASE_URL="https://raw.githubusercontent.com/gSpotx2f/packages-openwrt/master"
 PKG_DIR="/tmp"
 
diff --git a/luci-app-ruantiblock/Makefile b/luci-app-ruantiblock/Makefile
index 5cd34c0..65bded4 100644
--- a/luci-app-ruantiblock/Makefile
+++ b/luci-app-ruantiblock/Makefile
@@ -4,7 +4,7 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=1.5.0-r1
+PKG_VERSION:=1.5.0-r2
 LUCI_TITLE:=LuCI support for ruantiblock
 LUCI_DEPENDS:=+ruantiblock
 LUCI_PKGARCH:=all
diff --git a/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/cron.js b/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/cron.js
index 1873a91..5f54cf5 100644
--- a/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/cron.js
+++ b/luci-app-ruantiblock/htdocs/luci-static/resources/view/ruantiblock/cron.js
@@ -15,7 +15,7 @@ return view.extend({
 	},
 
 	cronStatusString: function(s) {
-		return s || _('No Shedule');
+		return s || _('No Sсhedule');
 	},
 
 	stringifyRuabTasks: function(str_array) {
diff --git a/luci-app-ruantiblock/po/ru/ruantiblock.po b/luci-app-ruantiblock/po/ru/ruantiblock.po
index 9ac81e0..afd2a0c 100644
--- a/luci-app-ruantiblock/po/ru/ruantiblock.po
+++ b/luci-app-ruantiblock/po/ru/ruantiblock.po
@@ -293,7 +293,7 @@ msgstr "Настройки модуля"
 msgid "Name"
 msgstr "Имя"
 
-msgid "No Shedule"
+msgid "No Sсhedule"
 msgstr "Нет расписания"
 
 msgid "No changes to save."
diff --git a/luci-app-ruantiblock/po/templates/ruantiblock.pot b/luci-app-ruantiblock/po/templates/ruantiblock.pot
index 299559d..353a11c 100644
--- a/luci-app-ruantiblock/po/templates/ruantiblock.pot
+++ b/luci-app-ruantiblock/po/templates/ruantiblock.pot
@@ -274,7 +274,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-msgid "No Shedule"
+msgid "No Sсhedule"
 msgstr ""
 
 msgid "No changes to save."
diff --git a/ruantiblock/Makefile b/ruantiblock/Makefile
index 2127305..b44e860 100644
--- a/ruantiblock/Makefile
+++ b/ruantiblock/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ruantiblock
 PKG_VERSION:=1.5.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_MAINTAINER:=gSpot <https://github.com/gSpotx2f/ruantiblock_openwrt>
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/ruantiblock/files/etc/ruantiblock/fqdn_filter b/ruantiblock/files/etc/ruantiblock/fqdn_filter
index 4e98f7f..c9b700a 100644
--- a/ruantiblock/files/etc/ruantiblock/fqdn_filter
+++ b/ruantiblock/files/etc/ruantiblock/fqdn_filter
@@ -5,7 +5,7 @@ paripartners
 marathon
 pm[-][0-9]
 fbmetrix
-[ck]?a[sz]ino?
+[ck]?a[sz]+ino?
 [vw]ul[ck]an
 slots?
 nar[ck]