From 7c765875884d6866c53b63757731b079bace2e9b Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 31 Oct 2009 15:54:11 +0000 Subject: all: change most translate statements to new format, some need manual cleanup --- .../luasrc/view/admin_system/applyreboot.htm | 6 ++-- .../admin-full/luasrc/view/admin_system/backup.htm | 14 ++++---- .../admin-full/luasrc/view/admin_system/ipkg.htm | 4 +-- .../luasrc/view/admin_system/packages.htm | 42 +++++++++++----------- .../admin-full/luasrc/view/admin_system/reboot.htm | 12 +++---- .../luasrc/view/admin_system/upgrade.htm | 3 +- 6 files changed, 40 insertions(+), 41 deletions(-) (limited to 'modules/admin-full/luasrc/view/admin_system') diff --git a/modules/admin-full/luasrc/view/admin_system/applyreboot.htm b/modules/admin-full/luasrc/view/admin_system/applyreboot.htm index 1a1a24bb0c..8ff7118c7e 100644 --- a/modules/admin-full/luasrc/view/admin_system/applyreboot.htm +++ b/modules/admin-full/luasrc/view/admin_system/applyreboot.htm @@ -13,9 +13,9 @@ $Id$ -%> <%+header%> -

<%:system%>

+

<%:System%>


-

<% if msg then %><%=msg%><% else %><%:a_s_applyreboot1%><% end %>

-

<%:a_s_reboot_running%>

+

<% if msg then %><%=msg%><% else %><%:Changes applied.%><% end %>

+

<%:Please wait: Device rebooting...%>

<%+footer%> \ No newline at end of file diff --git a/modules/admin-full/luasrc/view/admin_system/backup.htm b/modules/admin-full/luasrc/view/admin_system/backup.htm index 2db044ddd3..a28d2b8066 100644 --- a/modules/admin-full/luasrc/view/admin_system/backup.htm +++ b/modules/admin-full/luasrc/view/admin_system/backup.htm @@ -13,15 +13,15 @@ $Id$ -%> <%+header%> -

<%:system%>

-

<%:a_s_backup%>

-

<%:a_s_backup1%>

+

<%:System%>

+

<%:Backup / Restore%>

+

<%:Here you can backup and restore your router configuration and - if possible - reset the router to the default settings.%>


@@ -29,12 +29,12 @@ $Id$
-
<%:a_s_backup_archive%>:
+
<%:Backup Archive%>:
- +
<%+footer%> \ No newline at end of file diff --git a/modules/admin-full/luasrc/view/admin_system/ipkg.htm b/modules/admin-full/luasrc/view/admin_system/ipkg.htm index 7f6c0fb897..c14e4546fc 100644 --- a/modules/admin-full/luasrc/view/admin_system/ipkg.htm +++ b/modules/admin-full/luasrc/view/admin_system/ipkg.htm @@ -13,6 +13,6 @@ $Id$ -%> diff --git a/modules/admin-full/luasrc/view/admin_system/packages.htm b/modules/admin-full/luasrc/view/admin_system/packages.htm index 5cd9f635a6..b4ece05321 100644 --- a/modules/admin-full/luasrc/view/admin_system/packages.htm +++ b/modules/admin-full/luasrc/view/admin_system/packages.htm @@ -25,29 +25,29 @@ function opkg_error(code) code = bit.rshift(tonumber(code), 8) return translate( 'a_s_packages_code%i' % code, - '%s %i' % { translate('code'), code } + '%s %i' % { translate('Code'), code } ) end -%> <%+header%> -

<%:system%>

-

<%:a_s_packages%>

+

<%:System%>

+

<%:Software%>


<% if install or remove or update or upgrade then %> -
<%:status%>:
+
<%:Status%>:
<% if update then %> - <%:a_s_packages_update%>: <% if update == 0 then %><%:ok%><% else %><%:error%> (<%=opkg_error(update)%>)<% end %>
+ <%:Package lists updated%>: <% if update == 0 then %><%:OK%><% else %><%:Error%> (<%=opkg_error(update)%>)<% end %>
<% end %> <% if upgrade then%> - <%:a_s_packages_upgrade%>: <% if upgrade == 0 then %><%:ok%><% else %><%:error%> (<%=opkg_error(upgrade)%>)<% end %>
+ <%:Upgrade installed packages%>: <% if upgrade == 0 then %><%:OK%><% else %><%:Error%> (<%=opkg_error(upgrade)%>)<% end %>
<% end %> <% if install then for k,v in pairs(install) do %> - <%:a_s_packages_install%> '<%=k%>': <% if v == 0 then %><%:ok%><% else %><%:error%> (<%=opkg_error(v)%>)<% end %>
+ <%:Install%> '<%=k%>': <% if v == 0 then %><%:OK%><% else %><%:Error%> (<%=opkg_error(v)%>)<% end %>
<% end end %> <% if remove then for k,v in pairs(remove) do %> - <%:a_s_packages_remove%> '<%=k%>': <% if v == 0 then %><%:ok%><% else %><%:error%> (<%=opkg_error(v)%>)<% end %>
+ <%:Remove%> '<%=k%>': <% if v == 0 then %><%:OK%><% else %><%:Error%> (<%=opkg_error(v)%>)<% end %>
<% end end %>

@@ -57,41 +57,41 @@ end

- +
- +
- +
- +
- - - - - + + + + + <% for k, pkg in pairs(pkgs) do %> - + <% end %> @@ -100,7 +100,7 @@ end
- +
diff --git a/modules/admin-full/luasrc/view/admin_system/reboot.htm b/modules/admin-full/luasrc/view/admin_system/reboot.htm index f1656fbb8d..5f2912d925 100644 --- a/modules/admin-full/luasrc/view/admin_system/reboot.htm +++ b/modules/admin-full/luasrc/view/admin_system/reboot.htm @@ -13,21 +13,21 @@ $Id$ -%> <%+header%> -

<%:system%>

-

<%:reboot%>

-

<%:a_s_reboot1%>

+

<%:System%>

+

<%:Reboot%>

+

<%:Reboots the operating system of your device%>

<%- local c = require("luci.model.uci").cursor():changes() if c and next(c) then -%> -

<%:a_s_reboot_u%>

+

<%:Warning: There are unsaved changes that will be lost while rebooting!%>

<%- end if not reboot then -%> -

<%:a_s_reboot_do%>

+

<%:Perform reboot%>

<%- else -%> -

<%:a_s_reboot_running%>

+

<%:Please wait: Device rebooting...%>

<%- end -%> <%+footer%> \ No newline at end of file diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm index 425113e62d..510a51b155 100644 --- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm +++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm @@ -15,7 +15,7 @@ $Id$ <%+header%> -

<%:system%>

+

<%:System%>

<%:admin_upgrade Flash Firmware%>

<% if step == 1 then %> @@ -73,7 +73,6 @@ $Id$ if flashsize > 0 then write(luci.i18n.translatef( - "admin_upgrade_spaceavail", " (%s available)", w.byte_format(flashsize) )) -- cgit v1.2.3
<%:a_s_packages_name%><%:version%><%:install%><%:delete%><%:descr%><%:Package name%><%:Version%><%:Install%><%:Delete%><%:Description%>
<%=luci.util.pcdata(pkg.Package)%> <%=luci.util.pcdata(pkg.Version)%> <% if not pkg.Status or not pkg.Status.installed then %><% else %><%:installed%><% end %><% if pkg.Status and pkg.Status.installed then %><% else %><%:notinstalled%><% end %><% if pkg.Status and pkg.Status.installed then %><% else %><%:not installed%><% end %> <%=luci.util.pcdata(pkg.Description)%>