From: Jo-Philipp Wich Date: Mon, 9 May 2011 23:04:26 +0000 (+0000) Subject: luci-0.10: merge trunk X-Git-Tag: 0.10.0~153 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cac737f54d6fc3ac3277d16028894f91fae3cfbb;p=oweals%2Fluci.git luci-0.10: merge trunk --- cac737f54d6fc3ac3277d16028894f91fae3cfbb diff --cc applications/luci-ffwizard/luasrc/model/cbi/freifunk/ffwizard.lua index f915cfa9a,f915cfa9a..8a6e07836 --- a/applications/luci-ffwizard/luasrc/model/cbi/freifunk/ffwizard.lua +++ b/applications/luci-ffwizard/luasrc/model/cbi/freifunk/ffwizard.lua @@@ -36,11 -36,11 +36,11 @@@ local lat = uci:get_first("system", "sy local lon = uci:get_first("system", "system", "longitude") local suffix = uci:get_first(community, "community", "suffix") or "olsr" --luci.i18n.loadc("ffwizard") ++luci.i18n.loadc("freifunk") -- Check if all necessary variables are available if not (community ~= "profile_na" and lat and lon) then -- luci.http.redirect(luci.dispatcher.build_url("admin", "freifunk", "ffwizard_error")) ++ luci.http.redirect(luci.dispatcher.build_url(unpack(luci.dispatcher.context.requested.path), "freifunk", "ffwizard_error")) return end @@@ -117,7 -117,7 +117,7 @@@ function cbi_meship6(dev end function cbi_netconf(dev) -- local d = f:field(Flag, "device_" .. dev , " " .. dev:upper() .. "", translate("Configure this interface.")) ++ local d = f:field(Flag, "device_" .. dev , " " .. dev:upper() .. "", "Configure this interface.") d:depends("netconfig", "1") d.rmempty = false function d.cfgvalue(self, section) @@@ -321,7 -321,7 +321,7 @@@ function wanproto.write(self, section, uci:set("network", "wan", "proto", value) uci:save("network") end --wanip = f:field(Value, "wanipaddr", translate("IP address")) ++wanip = f:field(Value, "wanipaddr", translate("Ip address")) wanip:depends("wanproto", "static") function wanip.cfgvalue(self, section) return uci:get("network", "wan", "ipaddr") @@@ -381,7 -381,7 +381,7 @@@ function wanpwd.write(self, section, va uci:save("network") end --wansec = f:field(Flag, "wansec", translate("Protect LAN"), translate("Check this to protect your LAN from other nodes or clients") .. " (" .. translate("recommended") .. ").") ++wansec = f:field(Flag, "wansec", translate("Protect LAN"), translate("Check this to protect your LAN from other nodes or clients" .. " (" .. translate("recommended") .. ").")) wansec.default = "1" wansec.rmempty = false wansec:depends("wanproto", "static") @@@ -437,7 -437,7 +437,7 @@@ if has_l2gvpn the end if has_hb then -- hb = f:field(Flag, "hb", translate("Heartbeat"), translate("Allow to transfer anonymous statistics about this node") .. " (" .. translate("recommended") .. ").") ++ hb = f:field(Flag, "hb", translate("Heartbeat"), translate("Allow to transfer anonymous statistics about this node" .. " (" .. translate("recommended") .. ").")) hb.rmempty = false hb:depends("netconfig", "1") function hb.cfgvalue(self, section) @@@ -457,9 -457,9 +457,9 @@@ function f.handle(self, state, data if data.pw1 then local stat = luci.sys.user.setpasswd("root", data.pw1) == 0 if stat then -- f.message = translate("Password successfully changed") ++ f.message = translate("a_s_changepw_changed") else -- f.errmessage = translate("Unknown Error") ++ f.errmessage = translate("unknownerror") end end data.pw1 = nil @@@ -1045,6 -1045,6 +1045,15 @@@ function main.write(self, section, valu uci:set("system", s['.name'], "zonename", "Europe/Berlin") uci:set("system", s['.name'], "timezone", 'CET-1CEST,M3.5.0,M10.5.0/3') end) ++ ++ -- Create time rdate_servers ++ local rdate = uci:get_all("freifunk", "time") ++ uci:delete_all("system", "time") ++ uci:section("system", "time", "rdate_servers", rdate) ++ rdate.server = rdate.rdate_servers ++ rdate.rdate_servers = "" ++ uci:delete_all("system", "rdate", nil) ++ uci:section("system", "rdate", nil, rdate) uci:save("system") -- Delete old watchdog settings diff --cc build/i18n-po2lua.pl index 5129055ff,5129055ff..000000000 deleted file mode 100755,100755 --- a/build/i18n-po2lua.pl +++ /dev/null @@@ -1,27 -1,27 +1,0 @@@ --#!/usr/bin/perl -- --@ARGV == 2 || die "Usage: $0 \n"; -- --my $source_dir = shift @ARGV; --my $target_dir = shift @ARGV; -- --if( ! -d $target_dir ) --{ -- system('mkdir', '-p', $target_dir); --} -- --if( open F, "find $source_dir -type f -name '*.po' |" ) --{ -- while( chomp( my $file = readline F ) ) -- { -- my ( $lang, $basename ) = $file =~ m{.+/(\w+)/([^/]+)\.po$}; -- $lang = lc $lang; -- $lang =~ s/_/-/g; -- -- printf "Generating %-40s ", "$target_dir/$basename.$lang.lmo"; -- system("./build/po2lmo", $file, "$target_dir/$basename.$lang.lmo"); -- print ( -f "$target_dir/$basename.$lang.lmo" ? "done\n" : "empty\n" ); -- } -- -- close F; --} diff --cc modules/freifunk/luasrc/view/freifunk/adminindex.htm index 58655cca6,58655cca6..0188f2e6d --- a/modules/freifunk/luasrc/view/freifunk/adminindex.htm +++ b/modules/freifunk/luasrc/view/freifunk/adminindex.htm @@@ -17,7 -17,7 +17,7 @@@ local basicsurl = luci.dispatcher.build <% if not (hostname and latitude and longitude and location) then%>
-- <%:Basic settings are incomplete. Please go to%> <%:Basic settings%> <%:and fill out all required fields.%> ++ <%:Basic settings are incomplete. Please go to%> <%:and fill out all required fields.%>

<%end%>

@@@ -35,7 -35,7 +35,7 @@@ if section.diversity ~= "0" and section.disabled ~= "1" then print('

' .. translate("Diversity is enabled for device") .. ' ' .. device .. '. ' .. translate("Go to") .. ' ' .. translate("wireless settings") .. ' ' .. -- translate("to disable it.") .. '

') ++ translate(" to disable it.") .. '

') end end) %> diff --cc po/en/base.po index d5c4993e8,430c3c6e7..4b8f65edf --- a/po/en/base.po +++ b/po/en/base.po @@@ -925,7 -997,10 +997,7 @@@ msgstr " msgid "IPv4" msgstr "" --msgid "IPv4 Firewall" -msgstr "" - + msgid "IPv4 WAN Status" msgstr "" msgid "IPv4-Address" @@@ -934,10 -1009,13 +1006,10 @@@ msgstr " msgid "IPv6" msgstr "IPv6" --msgid "IPv6 Firewall" -msgstr "" - + msgid "IPv6 Setup" msgstr "" - msgid "IPv6 Setup" + msgid "IPv6 WAN Status" msgstr "" msgid "Identity" @@@ -1041,9 -1125,9 +1119,6 @@@ msgstr " msgid "Java Script required!" msgstr "" --msgid "Join Network" --msgstr "Join Network" -- msgid "Join Network: Settings" msgstr "" @@@ -1301,12 -1397,12 +1388,6 @@@ msgstr " msgid "Mounted file systems" msgstr "Mounted file systems" --msgid "Move down" --msgstr "" -- --msgid "Move up" --msgstr "" -- msgid "Multicast Rate" msgstr "Multicast Rate" @@@ -1749,9 -1881,9 +1866,6 @@@ msgstr "Save msgid "Save & Apply" msgstr "Save & Apply" --msgid "Save & Apply" --msgstr "" -- msgid "Scan" msgstr "Scan" @@@ -1836,9 -1968,9 +1950,6 @@@ msgstr " "Sorry. OpenWrt does not support a system upgrade on this platform.
You " "need to manually flash your device." --msgid "Sort" --msgstr "" -- msgid "Source" msgstr "Source" @@@ -1884,9 -2028,9 +2007,6 @@@ msgstr "Stop msgid "Strict order" msgstr "Strict order" --msgid "Submit" --msgstr "Submit" -- msgid "Swap Entry" msgstr "" @@@ -2539,6 -2728,6 +2704,9 @@@ msgstr "« Back #~ msgid "Join (Client)" #~ msgstr "Join (Client)" ++#~ msgid "Join Network" ++#~ msgstr "Join Network" ++ #~ msgid "Leases" #~ msgstr "Leases" @@@ -2740,5 -2929,5 +2908,8 @@@ #~ msgid "Statistics" #~ msgstr "Statistics" ++#~ msgid "Submit" ++#~ msgstr "Submit" ++ #~ msgid "zone" #~ msgstr "Zone" diff --cc po/ms/base.po index 602b414e9,0a1ec77df..c13a95c8e --- a/po/ms/base.po +++ b/po/ms/base.po @@@ -906,7 -980,10 +980,7 @@@ msgstr " msgid "IPv4" msgstr "" --msgid "IPv4 Firewall" -msgstr "" - + msgid "IPv4 WAN Status" msgstr "" msgid "IPv4-Address" @@@ -915,9 -992,9 +989,6 @@@ msgstr " msgid "IPv6" msgstr "Konfigurasi IPv6" --msgid "IPv6 Firewall" --msgstr "" -- msgid "IPv6 Setup" msgstr "Setup IPv6" @@@ -1022,10 -1108,10 +1102,6 @@@ msgstr " msgid "Java Script required!" msgstr "" --#, fuzzy --msgid "Join Network" --msgstr "Gabung Rangkaian" -- msgid "Join Network: Settings" msgstr "" @@@ -1285,12 -1383,12 +1373,6 @@@ msgstr " msgid "Mounted file systems" msgstr "Mounted fail sistems" --msgid "Move down" --msgstr "" -- --msgid "Move up" --msgstr "" -- msgid "Multicast Rate" msgstr "Multicast Rate" @@@ -1732,9 -1866,9 +1850,6 @@@ msgstr "Simpan msgid "Save & Apply" msgstr "Simpan & Melaksanakan" --msgid "Save & Apply" --msgstr "" -- msgid "Scan" msgstr "Scan" @@@ -1818,9 -1952,9 +1933,6 @@@ msgstr " "Maafkan. OpenWRT tidak menyokong meningkatkan sistem pada peron ini.
Anda perlu flash peranti anda secara manual." --msgid "Sort" --msgstr "" -- msgid "Source" msgstr "Sumber" @@@ -1867,9 -2013,9 +1991,6 @@@ msgstr " msgid "Strict order" msgstr "Order Ketat" --msgid "Submit" --msgstr "Menyerahkan" -- msgid "Swap Entry" msgstr "" @@@ -2518,6 -2706,6 +2681,10 @@@ msgstr "« Kembali #~ msgid "Join (Client)" #~ msgstr "Gabung dengan (Client)" ++#, fuzzy ++#~ msgid "Join Network" ++#~ msgstr "Gabung Rangkaian" ++ #~ msgid "Leases" #~ msgstr "Penyewaan" @@@ -2717,5 -2905,5 +2884,8 @@@ #~ msgid "Statistics" #~ msgstr "Statistik" ++#~ msgid "Submit" ++#~ msgstr "Menyerahkan" ++ #~ msgid "zone" #~ msgstr "Zon" diff --cc po/no/base.po index 1ac1c734d,cfbd9d643..f17d05a08 --- a/po/no/base.po +++ b/po/no/base.po @@@ -925,7 -997,10 +997,7 @@@ msgstr " msgid "IPv4" msgstr "" --msgid "IPv4 Firewall" -msgstr "" - + msgid "IPv4 WAN Status" msgstr "" msgid "IPv4-Address" @@@ -934,9 -1009,9 +1006,6 @@@ msgstr " msgid "IPv6" msgstr "IPv6" --msgid "IPv6 Firewall" --msgstr "" -- msgid "IPv6 Setup" msgstr "IPv6 Oppsett" @@@ -1040,9 -1124,9 +1118,6 @@@ msgstr " msgid "Java Script required!" msgstr "" --msgid "Join Network" --msgstr "Koble til nettverk" -- msgid "Join Network: Settings" msgstr "" @@@ -1298,12 -1394,12 +1385,6 @@@ msgstr " msgid "Mounted file systems" msgstr "Monterte filsystemer" --msgid "Move down" --msgstr "" -- --msgid "Move up" --msgstr "" -- msgid "Multicast Rate" msgstr "Multicast hastighet" @@@ -1748,9 -1880,9 +1865,6 @@@ msgstr "Lagre msgid "Save & Apply" msgstr "Lagre & Aktiver" --msgid "Save & Apply" --msgstr "" -- msgid "Scan" msgstr "Skann" @@@ -1834,9 -1966,9 +1948,6 @@@ msgstr " "Beklager. OpenWrt støtter ikke systemoppgradering på denne plattformen.
Du må flashe enheten manuelt." --msgid "Sort" --msgstr "" -- msgid "Source" msgstr "Kilde" @@@ -1882,9 -2026,9 +2005,6 @@@ msgstr "Stop msgid "Strict order" msgstr "Streng overholdelse" --msgid "Submit" --msgstr "Utfør" -- msgid "Swap Entry" msgstr "" @@@ -2546,6 -2736,6 +2712,9 @@@ msgstr "« Tilbake #~ msgid "Join (Client)" #~ msgstr "Koble til (klient)" ++#~ msgid "Join Network" ++#~ msgstr "Koble til nettverk" ++ #~ msgid "Leases" #~ msgstr "Leier" @@@ -2740,5 -2930,5 +2909,8 @@@ #~ msgid "Statistics" #~ msgstr "Statistikk" ++#~ msgid "Submit" ++#~ msgstr "Utfør" ++ #~ msgid "zone" #~ msgstr "Sone" diff --cc po/pl/base.po index f15af7cca,279a8e776..bf40a1797 --- a/po/pl/base.po +++ b/po/pl/base.po @@@ -868,7 -961,10 +961,7 @@@ msgstr " msgid "IPv4" msgstr "" --msgid "IPv4 Firewall" -msgstr "" - + msgid "IPv4 WAN Status" msgstr "" msgid "IPv4-Address" @@@ -877,10 -973,13 +970,10 @@@ msgstr " msgid "IPv6" msgstr "" --msgid "IPv6 Firewall" -msgstr "" - + msgid "IPv6 Setup" msgstr "" - msgid "IPv6 Setup" + msgid "IPv6 WAN Status" msgstr "" msgid "Identity" @@@ -977,9 -1082,9 +1076,6 @@@ msgstr " msgid "Java Script required!" msgstr "" --msgid "Join Network" --msgstr "" -- msgid "Join Network: Settings" msgstr "" @@@ -1227,12 -1344,12 +1335,6 @@@ msgstr " msgid "Mounted file systems" msgstr "" --msgid "Move down" --msgstr "" -- --msgid "Move up" --msgstr "" -- msgid "Multicast Rate" msgstr "" @@@ -1665,9 -1818,9 +1803,6 @@@ msgstr " msgid "Save & Apply" msgstr "" --msgid "Save & Apply" --msgstr "" -- msgid "Scan" msgstr "" @@@ -1749,9 -1902,9 +1884,6 @@@ msgid " "need to manually flash your device." msgstr "" --msgid "Sort" --msgstr "" -- msgid "Source" msgstr "" @@@ -1794,12 -1956,15 +1935,12 @@@ msgstr " msgid "Status" msgstr "" - msgid "Strict order" + msgid "Stop" msgstr "" - msgid "Submit" + msgid "Strict order" msgstr "" -msgid "Submit" -msgstr "" - msgid "Swap Entry" msgstr ""