From bb2def39406667f68ef1270623329986384938f4 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 6 Nov 2008 14:49:28 +0000 Subject: [PATCH] * luci-0.8: merge r3724, r3725 --- contrib/package/luci/Makefile | 14 ++++++++++++++ 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 +- .../luasrc/i18n/admin-core.pt-br.lua | 2 +- .../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 +- 11 files changed, 24 insertions(+), 10 deletions(-) diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 86a39c42f..9ae6f57bb 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -428,6 +428,16 @@ define Package/luci-app-initmgr/install $(call Package/luci/install/template,$(1),applications/luci-initmgr) endef +#define Package/luci-app-polipo +# $(call Package/luci/webtemplate) +# TITLE:=LuCI Support for the Polipo Proxy +# DEPENDS+=+luci-admin-core +polipo +#endef + +#define Package/luci-app-polipo/install +# $(call Package/luci/install/template,$(1),applications/luci-polipo) +#endef + ### Server Gateway Interfaces ### @@ -612,6 +622,9 @@ endif ifneq ($(CONFIG_PACKAGE_luci-app-initmgr),) PKG_SELECTED_MODULES+=applications/luci-initmgr endif +#ifneq ($(CONFIG_PACKAGE_luci-app-polipo),) +# PKG_SELECTED_MODULES+=applications/luci-polipo +#endif ifneq ($(CONFIG_PACKAGE_luci-sgi-cgi),) @@ -685,6 +698,7 @@ $(eval $(call BuildPackage,luci-app-ushare)) $(eval $(call BuildPackage,luci-app-hd_idle)) $(eval $(call BuildPackage,luci-app-tinyproxy)) $(eval $(call BuildPackage,luci-app-initmgr)) +#$(eval $(call BuildPackage,luci-app-polipo)) $(eval $(call BuildPackage,luci-sgi-cgi)) diff --git a/i18n/english/luasrc/i18n/admin-core.en.lua b/i18n/english/luasrc/i18n/admin-core.en.lua index 9b6df51f7..b9d77ceb8 100644 --- a/i18n/english/luasrc/i18n/admin-core.en.lua +++ b/i18n/english/luasrc/i18n/admin-core.en.lua @@ -34,7 +34,7 @@ routes_metric = 'Metric' a_s_desc = 'Here you can configure the basic aspects of your device like its hostname or the timezone.' a_s_packages = 'Software' a_s_changepw = 'Admin Password' -a_s_p_ipkg = 'IPKG-Configuration' +a_s_p_ipkg = 'OPKG-Configuration' a_s_sshkeys = 'SSH-Keys' a_s_fstab = 'Mount Points' a_s_flash = 'Flash Firmware' diff --git a/i18n/english/luasrc/i18n/admin-core.en.xml b/i18n/english/luasrc/i18n/admin-core.en.xml index 7e018a280..e1f29ffbe 100644 --- a/i18n/english/luasrc/i18n/admin-core.en.xml +++ b/i18n/english/luasrc/i18n/admin-core.en.xml @@ -38,7 +38,7 @@ Here you can configure the basic aspects of your device like its hostname or the timezone. Software Admin Password -IPKG-Configuration +OPKG-Configuration SSH-Keys Mount Points Flash Firmware diff --git a/i18n/french/luasrc/i18n/admin-core.fr.lua b/i18n/french/luasrc/i18n/admin-core.fr.lua index da62227a5..54b01ab8b 100644 --- a/i18n/french/luasrc/i18n/admin-core.fr.lua +++ b/i18n/french/luasrc/i18n/admin-core.fr.lua @@ -33,7 +33,7 @@ routes_gateway = 'Passerelle' routes_metric = 'Metrique' a_s_packages = 'Software' a_s_changepw = 'Mot de passe administrateur' -a_s_p_ipkg = 'Configuration IPKG' +a_s_p_ipkg = 'Configuration OPKG' a_s_sshkeys = 'Clés SSH' a_s_fstab = 'Points de montage' a_s_flash = 'Mise à jour firmware' diff --git a/i18n/french/luasrc/i18n/admin-core.fr.xml b/i18n/french/luasrc/i18n/admin-core.fr.xml index 7fa43ec29..b69e3d64c 100644 --- a/i18n/french/luasrc/i18n/admin-core.fr.xml +++ b/i18n/french/luasrc/i18n/admin-core.fr.xml @@ -45,7 +45,7 @@ Software Mot de passe administrateur -Configuration IPKG +Configuration OPKG Clés SSH Points de montage Mise à jour firmware diff --git a/i18n/german/luasrc/i18n/admin-core.de.lua b/i18n/german/luasrc/i18n/admin-core.de.lua index 81bf784eb..06451b434 100644 --- a/i18n/german/luasrc/i18n/admin-core.de.lua +++ b/i18n/german/luasrc/i18n/admin-core.de.lua @@ -60,7 +60,7 @@ a_s_fstab_swap1 = 'Falls der Arbeitsspeicher des Routers nicht ausreicht, kann d a_s_i_system1 = 'Hier finden sich Einstellungen, die das System selbst, dessen Kennung, installierte Software und Hardware, Authentifizierung oder eingehängte Speicher betreffen.' a_s_i_system2 = 'Diese Einstellungen definieren die Grundlage des Systems, auf dem die installierte Software aufbaut.' a_s_i_system3 = 'Beachte bitte, dass eine fehlerhafte Konfiguration den Start des Routers verhindern oder dich vom Zugriff auf diesen ausschließen kann.' -a_s_p_ipkg = 'IPKG-Konfiguration' +a_s_p_ipkg = 'OPKG-Konfiguration' a_s_p_ipkg_pkglists = 'Paketlisten' a_s_p_ipkg_targets = 'Installationsziele' a_s_packages = 'Paketverwaltung' diff --git a/i18n/german/luasrc/i18n/admin-core.de.xml b/i18n/german/luasrc/i18n/admin-core.de.xml index 0ee94019f..9ca8b95c8 100644 --- a/i18n/german/luasrc/i18n/admin-core.de.xml +++ b/i18n/german/luasrc/i18n/admin-core.de.xml @@ -64,7 +64,7 @@ Hier finden sich Einstellungen, die das System selbst, dessen Kennung, installierte Software und Hardware, Authentifizierung oder eingehängte Speicher betreffen. Diese Einstellungen definieren die Grundlage des Systems, auf dem die installierte Software aufbaut. Beachte bitte, dass eine fehlerhafte Konfiguration den Start des Routers verhindern oder dich vom Zugriff auf diesen ausschließen kann. -IPKG-Konfiguration +OPKG-Konfiguration Paketlisten Installationsziele Paketverwaltung 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 de6a31d45..987501a4c 100644 --- a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua +++ b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.lua @@ -34,7 +34,7 @@ routes_metric = 'Métrica' a_s_desc = 'Aqui você pode configurar os aspectos básicos do seu equipamento como o nome do host ou o fuso horário.' a_s_packages = 'Software' a_s_changepw = 'Senha do Admin' -a_s_p_ipkg = 'Configuração-IPKG' +a_s_p_ipkg = 'Configuração-OPKG' a_s_sshkeys = 'Chaves-SSH' a_s_fstab = 'Pontos de Montagem' a_s_flash = 'Atualizar Firmware' 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 f70a6f132..c898fcb13 100644 --- a/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml +++ b/i18n/portuguese_brazilian/luasrc/i18n/admin-core.pt-br.xml @@ -38,7 +38,7 @@ Aqui você pode configurar os aspectos básicos do seu equipamento como o nome do host ou o fuso horário. Software Senha do Admin -Configuração-IPKG +Configuração-OPKG Chaves-SSH Pontos de Montagem Atualizar Firmware diff --git a/i18n/russian/luasrc/i18n/admin-core.ru.lua b/i18n/russian/luasrc/i18n/admin-core.ru.lua index bab924b46..8e19863b1 100644 --- a/i18n/russian/luasrc/i18n/admin-core.ru.lua +++ b/i18n/russian/luasrc/i18n/admin-core.ru.lua @@ -34,7 +34,7 @@ routes_metric = 'Метрика' a_s_desc = 'Здесь вы можете настроить основные параметры вашего устройства такие как имя хоста или часовой пояс.' a_s_packages = 'Программное обеспечение' a_s_changepw = 'Пароль администратора' -a_s_p_ipkg = 'IPKG-Настройка' +a_s_p_ipkg = 'OPKG-Настройка' a_s_sshkeys = 'SSH-Ключи' a_s_fstab = 'Дисковые разделы' a_s_flash = 'Обновление прошивки' diff --git a/i18n/russian/luasrc/i18n/admin-core.ru.xml b/i18n/russian/luasrc/i18n/admin-core.ru.xml index 4ea7b2a43..b98786f26 100644 --- a/i18n/russian/luasrc/i18n/admin-core.ru.xml +++ b/i18n/russian/luasrc/i18n/admin-core.ru.xml @@ -38,7 +38,7 @@ Здесь вы можете настроить основные параметры вашего устройства такие как имя хоста или часовой пояс. Программное обеспечение Пароль администратора -IPKG-Настройка +OPKG-Настройка SSH-Ключи Дисковые разделы Обновление прошивки -- 2.25.1