diff options
6 files changed, 18 insertions, 18 deletions
diff --git a/applications/luci-app-advanced-reboot/Makefile b/applications/luci-app-advanced-reboot/Makefile index b1ecf677f0..08919640d7 100644 --- a/applications/luci-app-advanced-reboot/Makefile +++ b/applications/luci-app-advanced-reboot/Makefile @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Stan Grishin (stangri@melmac.net) +# Copyright 2017-2018 Stan Grishin (stangri@melmac.net) # This is free software, licensed under the GNU General Public License v3. include $(TOPDIR)/rules.mk @@ -13,7 +13,7 @@ LUCI_DESCRIPTION:=Provides Web UI (found under System/Advanced Reboot) to reboot LUCI_DEPENDS:=+luci-mod-admin-full LUCI_PKGARCH:=all -PKG_RELEASE:=32 +PKG_RELEASE:=33 include ../../luci.mk diff --git a/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua b/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua index f4d28145ea..dd8071677e 100644 --- a/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua +++ b/applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua @@ -1,4 +1,4 @@ --- Copyright 2017 Stan Grishin <stangri@melmac.net> +-- Copyright 2017-2018 Stan Grishin <stangri@melmac.net> -- Licensed to the public under the Apache License 2.0. module("luci.controller.advanced_reboot", package.seeall) diff --git a/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm b/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm index dcf51c749e..5c14f52ff8 100644 --- a/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm +++ b/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm @@ -1,7 +1,7 @@ <%# Copyright 2008 Steven Barth <steven@midlink.org> Copyright 2008-2015 Jo-Philipp Wich <jow@openwrt.org> - Copyright 2017 Stan Grishin <stangri@melmac.net> + Copyright 2017-2018 Stan Grishin <stangri@melmac.net> Licensed to the public under the Apache License 2.0. -%> @@ -42,12 +42,12 @@ <%- if boot_envvar1_partition_one == current_partition then -%> <form method="post" action="<%=url('admin/system/advanced_reboot/reboot')%>"> <input type="hidden" name="token" value="<%=token%>" /> - <input id="reboot-button" type="submit" class="cbi-button cbi-button-apply" value="<%:Reboot to current partition%>" /> + <input id="reboot-button" type="submit" class="cbi-button cbi-button-apply important" value="<%:Reboot to current partition%>" /> </form> <%- else -%> <form method="post" action="<%=url('admin/system/advanced_reboot/alternative_reboot')%>"> <input type="hidden" name="token" value="<%=token%>" /> - <input id="altreboot-button" type="submit" class="cbi-button cbi-button-apply" value="<%:Reboot to alternative partition...%>" /> + <input id="altreboot-button" type="submit" class="cbi-button cbi-button-apply important" value="<%:Reboot to alternative partition...%>" /> </form> <%- end -%> </div> @@ -66,12 +66,12 @@ <%- if boot_envvar1_partition_two == current_partition then -%> <form method="post" action="<%=url('admin/system/advanced_reboot/reboot')%>"> <input type="hidden" name="token" value="<%=token%>" /> - <input id="reboot-button" type="submit" class="cbi-button cbi-button-apply" value="<%:Reboot to current partition%>" /> + <input id="reboot-button" type="submit" class="cbi-button cbi-button-apply important" value="<%:Reboot to current partition%>" /> </form> <%- else -%> <form method="post" action="<%=url('admin/system/advanced_reboot/alternative_reboot')%>"> <input type="hidden" name="token" value="<%=token%>" /> - <input id="altreboot-button" type="submit" class="cbi-button cbi-button-apply" value="<%:Reboot to alternative partition...%>" /> + <input id="altreboot-button" type="submit" class="cbi-button cbi-button-apply important" value="<%:Reboot to alternative partition...%>" /> </form> <%- end -%> </div> @@ -82,7 +82,7 @@ <%- if rom_board_name then -%> <p class="alert-message warning"><%=pcdata(translatef("Warning: Device (%s) is unknown or isn't a dual-partition device!", rom_board_name))%></p> <%- else -%> - <p class="alert-message warning"><%:Warning: Unable to obtain device information!%></p> + <p class="alert-message warning"><%=pcdata(translatef("Warning: Unable to obtain device information!"))%></p> <%- end -%> <%- end -%> @@ -91,7 +91,7 @@ <%- if nixio.fs.access("/sbin/poweroff") then -%> <form method="post" action="<%=url('admin/system/advanced_reboot/power_off')%>"> <input type="hidden" name="token" value="<%=token%>" /> - <input id="poweroff-button" type="submit" class="cbi-button cbi-button-apply" value="<%:Perform power off...%>" /> + <input id="poweroff-button" type="submit" class="cbi-button cbi-button-apply important" value="<%:Perform power off...%>" /> </form> <%- else -%> <p class="alert-message warning"><%:Warning: This system does not support powering off!%></p> diff --git a/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/alternative_reboot.htm b/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/alternative_reboot.htm index 6325934094..b15f16b0d5 100644 --- a/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/alternative_reboot.htm +++ b/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/alternative_reboot.htm @@ -1,7 +1,7 @@ <%# Copyright 2008 Steven Barth <steven@midlink.org> Copyright 2008-2009 Jo-Philipp Wich <jow@openwrt.org> - Copyright 2017 Stan Grishin <stangri@melmac.net> + Copyright 2017-2018 Stan Grishin <stangri@melmac.net> Licensed to the public under the Apache License 2.0. -%> @@ -21,8 +21,8 @@ <form class="inline" action="<%=REQUEST_URI%>" method="post"> <input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="step" value="2" /> - <input class="cbi-button cbi-button-reset" name="cancel" type="submit" value="<%:Cancel%>" /> - <input class="cbi-button cbi-button-apply" type="submit" value="<%:Proceed%>" /> + <input class="cbi-button cbi-button-reset important" name="cancel" type="submit" value="<%:Cancel%>" /> + <input class="cbi-button cbi-button-apply important" type="submit" value="<%:Proceed%>" /> </form> </div> diff --git a/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/power_off.htm b/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/power_off.htm index 0ddea11e65..1acf01b995 100644 --- a/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/power_off.htm +++ b/applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/power_off.htm @@ -1,7 +1,7 @@ <%# Copyright 2008 Steven Barth <steven@midlink.org> Copyright 2008-2009 Jo-Philipp Wich <jow@openwrt.org> - Copyright 2017 Stan Grishin <stangri@melmac.net> + Copyright 2017-2018 Stan Grishin <stangri@melmac.net> Licensed to the public under the Apache License 2.0. -%> @@ -17,8 +17,8 @@ <form class="inline" action="<%=REQUEST_URI%>" method="post"> <input type="hidden" name="token" value="<%=token%>" /> <input type="hidden" name="step" value="2" /> - <input class="cbi-button cbi-button-reset" name="cancel" type="submit" value="<%:Cancel%>" /> - <input class="cbi-button cbi-button-apply" type="submit" value="<%:Proceed%>" /> + <input class="cbi-button cbi-button-reset important" name="cancel" type="submit" value="<%:Cancel%>" /> + <input class="cbi-button cbi-button-apply important" type="submit" value="<%:Proceed%>" /> </form> </div> diff --git a/modules/luci-base/po/ru/base.po b/modules/luci-base/po/ru/base.po index 65a6a01cf8..5cf3ad1999 100644 --- a/modules/luci-base/po/ru/base.po +++ b/modules/luci-base/po/ru/base.po @@ -3,7 +3,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Project-Id-Version: LuCI: base\n" "POT-Creation-Date: 2010-05-09 01:01+0300\n" -"PO-Revision-Date: 2018-07-17 11:24+0300\n" +"PO-Revision-Date: 2018-07-20 02:06+0300\n" "Language-Team: http://cyber-place.ru\n" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" @@ -3335,7 +3335,7 @@ msgstr "" "<code>_</code>" msgid "The backup archive does not appear to be a valid gzip file." -msgstr "Архив резервной копии не являетсяg правильным gzip файлом." +msgstr "Архив резервной копии не является правильным gzip файлом." msgid "The configuration file could not be loaded due to the following error:" msgstr "Не удалось загрузить config файл из-за следующей ошибки:" |