From dc00b42e6da0765e6fd213e50230d4765569f9ac Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 27 Oct 2008 15:19:58 +0000 Subject: [PATCH] * luci: replace all "OpenWRT" occurences with "OpenWrt" --- INSTALL | 4 ++-- THANKYOU | 4 ++-- contrib/package/luci/Makefile | 4 ++-- i18n/english/luasrc/i18n/admin-core.en.lua | 2 +- i18n/english/luasrc/i18n/admin-core.en.xml | 2 +- i18n/french/luasrc/i18n/admin-core.fr.lua | 2 +- i18n/french/luasrc/i18n/admin-core.fr.xml | 2 +- i18n/german/luasrc/i18n/admin-core.de.lua | 2 +- i18n/german/luasrc/i18n/admin-core.de.xml | 2 +- i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua | 2 +- i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml | 2 +- i18n/russian/luasrc/i18n/admin-core.ru.lua | 2 +- i18n/russian/luasrc/i18n/admin-core.ru.xml | 2 +- libs/sgi-webuci/root/etc/init.d/boa | 2 +- modules/admin-core/luasrc/view/about.htm | 6 +++--- .../root/etc/uci-defaults/luci-theme-openwrtlight | 2 +- themes/openwrt.org/root/etc/uci-defaults/luci-theme-openwrt | 2 +- 17 files changed, 22 insertions(+), 22 deletions(-) diff --git a/INSTALL b/INSTALL index 26c96a6f4..861c8d03f 100644 --- a/INSTALL +++ b/INSTALL @@ -6,9 +6,9 @@ TOC: 1. Kamikaze Feed - 1. Change to your OpenWRT buildroot + 1. Change to your OpenWrt buildroot - 2. Add the following line to your OpenWRT feeds.conf: + 2. Add the following line to your OpenWrt feeds.conf: src-svn luci https://svn.luci.subsignal.org/luci/trunk/contrib/package 3. Run ./scripts/feeds update diff --git a/THANKYOU b/THANKYOU index 90d76b018..f0519bd8b 100644 --- a/THANKYOU +++ b/THANKYOU @@ -3,7 +3,7 @@ I'd like to thank the following people for contributing to this software: * Anton Popov - for rewriting the openwrt.org theme -* Florian Fainelli (OpenWRT) +* Florian Fainelli (OpenWrt) - for the french translation * Alina Friedrichsen @@ -22,5 +22,5 @@ Also a big thank you goes to: - for donating several boards for testing and his feedback * Mickey (Freifunk Hannover) - - for his feedback and fixes for the OpenWRT builds + - for his feedback and fixes for the OpenWrt builds diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index b2a19a1f7..60f119060 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -609,7 +609,7 @@ endef define Package/luci-theme-openwrt $(call Package/luci/thtemplate) - TITLE:=OpenWRT.org (default) + TITLE:=OpenWrt.org (default) DEPENDS:=+luci-theme-base endef @@ -619,7 +619,7 @@ endef define Package/luci-theme-openwrtlight $(call Package/luci/thtemplate) - TITLE:=OpenWRT.org - light variant without images + TITLE:=OpenWrt.org - light variant without images DEPENDS:=+luci-theme-base endef diff --git a/i18n/english/luasrc/i18n/admin-core.en.lua b/i18n/english/luasrc/i18n/admin-core.en.lua index a9dab7e4b..9b6df51f7 100644 --- a/i18n/english/luasrc/i18n/admin-core.en.lua +++ b/i18n/english/luasrc/i18n/admin-core.en.lua @@ -8,7 +8,7 @@ c_contributors = 'Contributing Developers' c_thanksto = 'Thanks To' a_i_i_hello = 'Hello!' a_i_i_admin1 = 'This is the administration area of LuCI.' -a_i_i_admin2 = 'LuCI is a free, flexible, and user friendly graphical interface for configuring OpenWRT Kamikaze.' +a_i_i_admin2 = 'LuCI is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze.' a_i_i_admin3 = 'On the following pages you can adjust all important settings of your router.' a_i_i_admin4 = 'Notice: In LuCI changes have to be confirmed by clicking Changes - Save & Apply before being applied.' a_i_i_admin5 = 'As we are always want to improve this interface we are looking forward to your feedback and suggestions.' diff --git a/i18n/english/luasrc/i18n/admin-core.en.xml b/i18n/english/luasrc/i18n/admin-core.en.xml index 9e07e80f0..7e018a280 100644 --- a/i18n/english/luasrc/i18n/admin-core.en.xml +++ b/i18n/english/luasrc/i18n/admin-core.en.xml @@ -12,7 +12,7 @@ Thanks To Hello! This is the administration area of LuCI. -LuCI is a free, flexible, and user friendly graphical interface for configuring OpenWRT Kamikaze. +LuCI is a free, flexible, and user friendly graphical interface for configuring OpenWrt Kamikaze. On the following pages you can adjust all important settings of your router. Notice: In LuCI changes have to be confirmed by clicking Changes - Save & Apply before being applied. As we are always want to improve this interface we are looking forward to your feedback and suggestions. diff --git a/i18n/french/luasrc/i18n/admin-core.fr.lua b/i18n/french/luasrc/i18n/admin-core.fr.lua index d21182688..da62227a5 100644 --- a/i18n/french/luasrc/i18n/admin-core.fr.lua +++ b/i18n/french/luasrc/i18n/admin-core.fr.lua @@ -8,7 +8,7 @@ c_contributors = 'Contributeurs' c_thanksto = 'Merci à' a_i_i_hello = 'Bonjour !' a_i_i_admin1 = 'Voici la page d'administration de LuCI.' -a_i_i_admin2 = 'LuCI est une interface graphique libre, flexible, et user friendly pour configurer OpenWRT Kamikaze.' +a_i_i_admin2 = 'LuCI est une interface graphique libre, flexible, et user friendly pour configurer OpenWrt Kamikaze.' a_i_i_admin3 = 'Dans les pages suivantes vous pouvez ajuster tous les réglages importants de votre routeur.' a_i_i_admin4 = 'Vous trouverez une page de navigation sur le côté gauche permettant d'accèder aux différentes pages de configuration.' a_i_i_admin5 = 'Nous souhaitons améliorer l'interface de manière permanente, vos retours et suggestions sont primordiaux.' diff --git a/i18n/french/luasrc/i18n/admin-core.fr.xml b/i18n/french/luasrc/i18n/admin-core.fr.xml index 4d3869b18..7fa43ec29 100644 --- a/i18n/french/luasrc/i18n/admin-core.fr.xml +++ b/i18n/french/luasrc/i18n/admin-core.fr.xml @@ -15,7 +15,7 @@ Bonjour ! Voici la page d'administration de LuCI. -LuCI est une interface graphique libre, flexible, et user friendly pour configurer OpenWRT Kamikaze. +LuCI est une interface graphique libre, flexible, et user friendly pour configurer OpenWrt Kamikaze. Dans les pages suivantes vous pouvez ajuster tous les réglages importants de votre routeur. Vous trouverez une page de navigation sur le côté gauche permettant d'accèder aux différentes pages de configuration. Nous souhaitons améliorer l'interface de manière permanente, vos retours et suggestions sont primordiaux. diff --git a/i18n/german/luasrc/i18n/admin-core.de.lua b/i18n/german/luasrc/i18n/admin-core.de.lua index 1ea56e346..81bf784eb 100644 --- a/i18n/german/luasrc/i18n/admin-core.de.lua +++ b/i18n/german/luasrc/i18n/admin-core.de.lua @@ -1,5 +1,5 @@ a_i_i_admin1 = 'Dies ist der Administrationsbereich von LuCI.' -a_i_i_admin2 = 'LuCI ist eine freie, flexible und benutzerfreundliche grafische Oberfläche zur Konfiguration von OpenWRT Kamikaze.' +a_i_i_admin2 = 'LuCI ist eine freie, flexible und benutzerfreundliche grafische Oberfläche zur Konfiguration von OpenWrt Kamikaze.' a_i_i_admin3 = 'Auf den folgenden Seiten können alle wichtigen Einstellungen des Routers vorgenommen werden.' a_i_i_admin4 = 'Hinweis: In LuCI werden getätigte Änderungen erst nach einem Klick auf Änderungen - Speichern & Anwenden angewandt.' a_i_i_admin5 = 'Wir sind natürlich stets darum bemüht, diese Oberfläche noch besser und intuitiver zu Gestalten und freuen uns über jegliche Art von Feedback oder Verbesserungsvorschlägen.' diff --git a/i18n/german/luasrc/i18n/admin-core.de.xml b/i18n/german/luasrc/i18n/admin-core.de.xml index 9078f7721..0ee94019f 100644 --- a/i18n/german/luasrc/i18n/admin-core.de.xml +++ b/i18n/german/luasrc/i18n/admin-core.de.xml @@ -3,7 +3,7 @@ Dies ist der Administrationsbereich von LuCI. -LuCI ist eine freie, flexible und benutzerfreundliche grafische Oberfläche zur Konfiguration von OpenWRT Kamikaze. +LuCI ist eine freie, flexible und benutzerfreundliche grafische Oberfläche zur Konfiguration von OpenWrt Kamikaze. Auf den folgenden Seiten können alle wichtigen Einstellungen des Routers vorgenommen werden. Hinweis: In LuCI werden getätigte Änderungen erst nach einem Klick auf Änderungen - Speichern & Anwenden angewandt. Wir sind natürlich stets darum bemüht, diese Oberfläche noch besser und intuitiver zu Gestalten und freuen uns über jegliche Art von Feedback oder Verbesserungsvorschlägen. diff --git a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua index a941c433e..de6a31d45 100644 --- a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua +++ b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua @@ -8,7 +8,7 @@ c_contributors = 'Desenvolvedores que Crontribuíram' c_thanksto = 'Obrigado à' a_i_i_hello = 'Olá!' a_i_i_admin1 = 'Esta é a área de administração LuCI.' -a_i_i_admin2 = 'LuCI é gratuito, flexível e uma interface gráfica fácil de utilizar para configurar OpenWRT Kamikaze.' +a_i_i_admin2 = 'LuCI é gratuito, flexível e uma interface gráfica fácil de utilizar para configurar OpenWrt Kamikaze.' a_i_i_admin3 = 'Nas próximas páginas você pode ajustar todas as definições importantes do seu roteador.' a_i_i_admin4 = 'Aviso: No LuCI as alterações devem ser confirmadas clicando em Alterações - Salvar & Aplicar antes de serem aplicadas.' a_i_i_admin5 = 'Como nós sempre queremos melhorar essa interface, estamos ansiosos para seus comentários e sugestões.' diff --git a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml index 923b45b53..f70a6f132 100644 --- a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml +++ b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml @@ -12,7 +12,7 @@ Obrigado à Olá! Esta é a área de administração LuCI. -LuCI é gratuito, flexível e uma interface gráfica fácil de utilizar para configurar OpenWRT Kamikaze. +LuCI é gratuito, flexível e uma interface gráfica fácil de utilizar para configurar OpenWrt Kamikaze. Nas próximas páginas você pode ajustar todas as definições importantes do seu roteador. Aviso: No LuCI as alterações devem ser confirmadas clicando em Alterações - Salvar & Aplicar antes de serem aplicadas. Como nós sempre queremos melhorar essa interface, estamos ansiosos para seus comentários e sugestões. diff --git a/i18n/russian/luasrc/i18n/admin-core.ru.lua b/i18n/russian/luasrc/i18n/admin-core.ru.lua index 9479db837..bab924b46 100644 --- a/i18n/russian/luasrc/i18n/admin-core.ru.lua +++ b/i18n/russian/luasrc/i18n/admin-core.ru.lua @@ -8,7 +8,7 @@ c_contributors = 'Помогавшие в разработке' c_thanksto = 'Благодаря' a_i_i_hello = 'Добро пожаловать.' a_i_i_admin1 = 'Это зона управления LuCI.' -a_i_i_admin2 = 'LuCI свободный, гибкий и дружелюбный грфический интерфейс для настройки OpenWRT Kamikaze.' +a_i_i_admin2 = 'LuCI свободный, гибкий и дружелюбный грфический интерфейс для настройки OpenWrt Kamikaze.' a_i_i_admin3 = 'С помощью этих страниц вы можете изменить основные настройки вашего роутера.' a_i_i_admin4 = 'Внимание: В LuCI изменения принимаются после нажатия - Принять.' a_i_i_admin5 = 'Так же мы всегда желаем улучшить этот интерфейс, мы всегда обратим внимание на ваши вопросы и предложения.' diff --git a/i18n/russian/luasrc/i18n/admin-core.ru.xml b/i18n/russian/luasrc/i18n/admin-core.ru.xml index 8e98259ba..4ea7b2a43 100644 --- a/i18n/russian/luasrc/i18n/admin-core.ru.xml +++ b/i18n/russian/luasrc/i18n/admin-core.ru.xml @@ -12,7 +12,7 @@ Благодаря Добро пожаловать. Это зона управления LuCI. -LuCI свободный, гибкий и дружелюбный грфический интерфейс для настройки OpenWRT Kamikaze. +LuCI свободный, гибкий и дружелюбный грфический интерфейс для настройки OpenWrt Kamikaze. С помощью этих страниц вы можете изменить основные настройки вашего роутера. Внимание: В LuCI изменения принимаются после нажатия - Принять. Так же мы всегда желаем улучшить этот интерфейс, мы всегда обратим внимание на ваши вопросы и предложения. diff --git a/libs/sgi-webuci/root/etc/init.d/boa b/libs/sgi-webuci/root/etc/init.d/boa index 57b039625..2a11ed7d3 100755 --- a/libs/sgi-webuci/root/etc/init.d/boa +++ b/libs/sgi-webuci/root/etc/init.d/boa @@ -4,7 +4,7 @@ # Modified for Debian GNU/Linux # by Ian Murdock . # Modified for boa by Bill Allombert . -# Modified for OpenWRT by Steven Barth . +# Modified for OpenWrt by Steven Barth . ### BEGIN INIT INFO # Provides: boa diff --git a/modules/admin-core/luasrc/view/about.htm b/modules/admin-core/luasrc/view/about.htm index b9b09c0d5..529649cc2 100644 --- a/modules/admin-core/luasrc/view/about.htm +++ b/modules/admin-core/luasrc/view/about.htm @@ -21,16 +21,16 @@ $Id$

<%:c_leaddev%>


<%:c_contributors%>

diff --git a/themes/openwrt-light/root/etc/uci-defaults/luci-theme-openwrtlight b/themes/openwrt-light/root/etc/uci-defaults/luci-theme-openwrtlight index b797a0073..c2322a4b4 100755 --- a/themes/openwrt-light/root/etc/uci-defaults/luci-theme-openwrtlight +++ b/themes/openwrt-light/root/etc/uci-defaults/luci-theme-openwrtlight @@ -1,6 +1,6 @@ #!/bin/sh uci batch <<-EOF - set luci.themes.OpenWRT_Light=/luci-static/openwrt-light + set luci.themes.OpenWrt_Light=/luci-static/openwrt-light commit luci EOF diff --git a/themes/openwrt.org/root/etc/uci-defaults/luci-theme-openwrt b/themes/openwrt.org/root/etc/uci-defaults/luci-theme-openwrt index a8bef6c92..d8dea0467 100755 --- a/themes/openwrt.org/root/etc/uci-defaults/luci-theme-openwrt +++ b/themes/openwrt.org/root/etc/uci-defaults/luci-theme-openwrt @@ -1,6 +1,6 @@ #!/bin/sh uci batch <<-EOF - set luci.themes.OpenWRT=/luci-static/openwrt.org + set luci.themes.OpenWrt=/luci-static/openwrt.org commit luci EOF -- 2.25.1