all: change most translate statements to new format, some need manual cleanup

16 files changed, 40 insertions, 40 deletions

diff --git a/libs/cbi/luasrc/view/cbi/delegator.htm b/libs/cbi/luasrc/view/cbi/delegator.htm
index f2c87b460..9b4d4e6bf 100644
--- a/libs/cbi/luasrc/view/cbi/delegator.htm
+++ b/libs/cbi/luasrc/view/cbi/delegator.htm
@@ -21,10 +21,10 @@ $Id$
 		<input class="cbi-button cbi-button-back" type="submit" name="cbi.delg.back" value="<%:cbi_back &lt; Back%>" />
 <% end %>
 <% if self.allow_reset then %>
-		<input class="cbi-button cbi-button-reset" type="reset" value="<%:reset%>" />
+		<input class="cbi-button cbi-button-reset" type="reset" value="<%:Reset%>" />
 <% end %>
 <% if self.allow_cancel then %>
-		<input class="cbi-button cbi-button-cancel" type="submit" name="cbi.cancel" value="<%:cancel%>" />
+		<input class="cbi-button cbi-button-cancel" type="submit" name="cbi.cancel" value="<%:Cancel%>" />
 <% end %>
 <% if self.allow_finish and not self:get_next(self.current) then %>
 	<input class="cbi-button cbi-button-finish" type="submit" value="<%:cbi_finish Finish%>" />
diff --git a/libs/cbi/luasrc/view/cbi/dynlist.htm b/libs/cbi/luasrc/view/cbi/dynlist.htm
index cbde2efb3..aa794c65f 100644
--- a/libs/cbi/luasrc/view/cbi/dynlist.htm
+++ b/libs/cbi/luasrc/view/cbi/dynlist.htm
@@ -20,9 +20,9 @@ $Id$
 %>
 	<input class="cbi-input-text" value="<%=pcdata(val)%>" onchange="cbi_d_update(this.id)" type="text"<%= attr("id", cbid .. "." .. i) .. attr("name", cbid) .. ifattr(self.size, "size")%> />
 	<% if i <= #vals then %>
-		<input class="cbi-input-image" type="image" value="<%:cbi_del%>" name="cbi.rle.<%=section .. "." .. self.option .. "." .. i%>" alt="<%:cbi_del%>" title="<%:cbi_del%>" src="<%=resource%>/cbi/remove.gif" />
+		<input class="cbi-input-image" type="image" value="<%:Delete%>" name="cbi.rle.<%=section .. "." .. self.option .. "." .. i%>" alt="<%:Delete%>" title="<%:Delete%>" src="<%=resource%>/cbi/remove.gif" />
 	<% else %>
-		<input class="cbi-input-image" type="image" value="<%:cbi_add%>" name="cbi.ale.<%=section .. "." .. self.option%>" alt="<%:cbi_add%>" title="<%:cbi_add%>" src="<%=resource%>/cbi/add.gif" />
+		<input class="cbi-input-image" type="image" value="<%:Add%>" name="cbi.ale.<%=section .. "." .. self.option%>" alt="<%:Add%>" title="<%:Add%>" src="<%=resource%>/cbi/add.gif" />
 	<% end %>
 	<% if #self.keylist > 0 then -%>
 		<script type="text/javascript">
@@ -37,7 +37,7 @@ $Id$
 			-%>
 			}, '<%- if not self.rmempty and not self.optional then -%>
 				<%-:cbi_select-%>
-			<%- end -%>', '<%:cbi_manual%>');
+			<%- end -%>', '<%:-- custom --%>');
 		</script>
 	<% end -%>
 <% if i <= #vals then %><br />
diff --git a/libs/cbi/luasrc/view/cbi/firewall_zonelist.htm b/libs/cbi/luasrc/view/cbi/firewall_zonelist.htm
index 94186954d..863452fbb 100644
--- a/libs/cbi/luasrc/view/cbi/firewall_zonelist.htm
+++ b/libs/cbi/luasrc/view/cbi/firewall_zonelist.htm
@@ -68,7 +68,7 @@ $Id$
 				<% end end %>
 				</span>
 			<% end end %>
-			<% if empty then %><em><%:a_s_ipt_zone_empty (no interfaces attached)%></em><% end %>
+			<% if empty then %><em><%:(no interfaces attached)%></em><% end %>
 		</label>
 	</li>
 	<% end end %>
@@ -77,7 +77,7 @@ $Id$
 	<li style="padding:0.5em">
 		<input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)" type="radio"<%=attr("id", cbid .. "_new") .. attr("name", cbid) .. attr("value", "-") .. ifattr(not selected, "checked", "checked")%> /> &nbsp;
 		<div style="background-color:<%=fwm.zone.get_color()%>; padding:0.5em; display:inline">
-			<label<%=attr("for", cbid .. "_new")%>><em><%:a_s_ipt_zone_unspec_create unspecified -or- create:%>&nbsp;</em></label>
+			<label<%=attr("for", cbid .. "_new")%>><em><%:unspecified -or- create:%>&nbsp;</em></label>
 			<input style="width:6em" type="text"<%=attr("name", cbid .. ".newzone") .. ifattr(not selected, "value", self.default)%> onfocus="document.getElementById('<%=cbid%>_new').checked=true" />
 		</div>
 	</li>
diff --git a/libs/cbi/luasrc/view/cbi/footer.htm b/libs/cbi/luasrc/view/cbi/footer.htm
index b6e893d1a..1796cd5dc 100644
--- a/libs/cbi/luasrc/view/cbi/footer.htm
+++ b/libs/cbi/luasrc/view/cbi/footer.htm
@@ -18,10 +18,10 @@ $Id$
 			<input class="cbi-button cbi-button-skip" type="submit" name="cbi.skip" value="<%:skip Skip%>" />
 		<% end %>
 		<% if not autoapply then%>
-			<input class="cbi-button cbi-button-apply" type="submit" name="cbi.apply" value="<%:saveapply%>" />
+			<input class="cbi-button cbi-button-apply" type="submit" name="cbi.apply" value="<%:Save & Apply%>" />
 		<% end %>
-		<input class="cbi-button cbi-button-save" type="submit" value="<%:save%>" />
-		<input class="cbi-button cbi-button-reset" type="reset" value="<%:reset%>" />
+		<input class="cbi-button cbi-button-save" type="submit" value="<%:Save%>" />
+		<input class="cbi-button cbi-button-reset" type="reset" value="<%:Reset%>" />
 		<script type="text/javascript">cbi_d_update();</script>
 	</div>
 	<%- end -%>
diff --git a/libs/cbi/luasrc/view/cbi/full_valueheader.htm b/libs/cbi/luasrc/view/cbi/full_valueheader.htm
index cbeda755b..f757d7feb 100644
--- a/libs/cbi/luasrc/view/cbi/full_valueheader.htm
+++ b/libs/cbi/luasrc/view/cbi/full_valueheader.htm
@@ -16,7 +16,7 @@ $Id$
 <div class="cbi-value<% if self.error and self.error[section] then %> cbi-value-error<% end %>" id="cbi-<%=self.config.."-"..section.."-"..self.option%>">
 	<%- if self.title and #self.title > 0 then -%>
 	<label class="cbi-value-title"<%= attr("for", cbid) %>>
-	<%- if self.titleref then -%><a title="<%=self.titledesc or translate('cbi_gorel')%>" class="cbi-title-ref" href="<%=self.titleref%>"><%- end -%>
+	<%- if self.titleref then -%><a title="<%=self.titledesc or translate(' ')%>" class="cbi-title-ref" href="<%=self.titleref%>"><%- end -%>
 		<%-=self.title-%>
 	<%- if self.titleref then -%></a><%- end -%>
 	</label>
diff --git a/libs/cbi/luasrc/view/cbi/header.htm b/libs/cbi/luasrc/view/cbi/header.htm
index 90b6f659a..c831b0df1 100644
--- a/libs/cbi/luasrc/view/cbi/header.htm
+++ b/libs/cbi/luasrc/view/cbi/header.htm
@@ -18,5 +18,5 @@ $Id$
 	<div>
 		<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
 		<input type="hidden" name="cbi.submit" value="1" />
-		<input type="submit" value="<%:save%>" class="hidden" />
+		<input type="submit" value="<%:Save%>" class="hidden" />
 	</div>
diff --git a/libs/cbi/luasrc/view/cbi/map.htm b/libs/cbi/luasrc/view/cbi/map.htm
index 0b5ac5881..861656894 100644
--- a/libs/cbi/luasrc/view/cbi/map.htm
+++ b/libs/cbi/luasrc/view/cbi/map.htm
@@ -18,7 +18,7 @@ $Id$
 	<div class="cbi-map-descr"><%=self.description%></div>
 	<%- if self._apply then -%>
 		<fieldset class="cbi-section">
-			<legend><%:cbi_applying%></legend>
+			<legend><%:Applying changes%></legend>
 			<ul class="cbi-apply"><%-
 				local fp = self._apply()
 				self._apply = nil
diff --git a/libs/cbi/luasrc/view/cbi/network_netlist.htm b/libs/cbi/luasrc/view/cbi/network_netlist.htm
index 3622b6fd7..c47b3a70e 100644
--- a/libs/cbi/luasrc/view/cbi/network_netlist.htm
+++ b/libs/cbi/luasrc/view/cbi/network_netlist.htm
@@ -41,7 +41,7 @@ $Id$
 				 %>
 					<img<%=attr("title", iface:get_i18n())%> style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" />
 				<% end end %>
-				<% if empty then %><em><%:a_s_ipt_zone_empty (no interfaces attached)%></em><% end %>
+				<% if empty then %><em><%:(no interfaces attached)%></em><% end %>
 			</span>
 		</label>
 	</li>
@@ -51,7 +51,7 @@ $Id$
 	<li style="padding:0.25em 0">
 		<input class="cbi-input-radio" onclick="cbi_d_update(this.id)" onchange="cbi_d_update(this.id)" type="radio"<%=attr("id", cbid .. "_new") .. attr("name", cbid) .. attr("value", "-") .. ifattr(not value, "checked", "checked")%> /> &nbsp;
 		<div style="padding:0.5em; display:inline">
-			<label<%=attr("for", cbid .. "_new")%>><em><%:a_s_ipt_zone_unspec_create unspecified -or- create:%>&nbsp;</em></label>
+			<label<%=attr("for", cbid .. "_new")%>><em><%:unspecified -or- create:%>&nbsp;</em></label>
 			<input style="width:6em" type="text"<%=attr("name", cbid .. ".newnet")%> onfocus="document.getElementById('<%=cbid%>_new').checked=true" />
 		</div>
 	</li>
diff --git a/libs/cbi/luasrc/view/cbi/nsection.htm b/libs/cbi/luasrc/view/cbi/nsection.htm
index d096ac3a0..1d231c542 100644
--- a/libs/cbi/luasrc/view/cbi/nsection.htm
+++ b/libs/cbi/luasrc/view/cbi/nsection.htm
@@ -23,7 +23,7 @@ $Id$
 		<%- end %>
 		<% if self.addremove then -%>
 			<div class="cbi-section-remove right">
-				<input type="submit" name="cbi.rns.<%=self.config%>.<%=section%>" value="<%:cbi_del%>" />
+				<input type="submit" name="cbi.rns.<%=self.config%>.<%=section%>" value="<%:Delete%>" />
 			</div>
 		<%- end %>
 		<%+cbi/tabmenu%>
@@ -39,7 +39,7 @@ $Id$
 			<legend><%=self.title%></legend>
 		<%- end %>
 		<div class="cbi-section-descr"><%=self.description%></div>
-		<input type="submit" class="cbi-button-add" name="cbi.cns.<%=self.config%>.<%=self.section%>" value="<%:cbi_add%>" />
+		<input type="submit" class="cbi-button-add" name="cbi.cns.<%=self.config%>.<%=self.section%>" value="<%:Add%>" />
 	</fieldset>
 	<%- end %>
 <% end %>
diff --git a/libs/cbi/luasrc/view/cbi/tblsection.htm b/libs/cbi/luasrc/view/cbi/tblsection.htm
index 99b5b97b5..3231f22aa 100644
--- a/libs/cbi/luasrc/view/cbi/tblsection.htm
+++ b/libs/cbi/luasrc/view/cbi/tblsection.htm
@@ -39,7 +39,7 @@ end
 			<%- end -%>
 			<%- for i, k in pairs(self.children) do if not k.optional then -%>
 				<th class="cbi-section-table-cell">
-				<%- if k.titleref then -%><a title="<%=self.titledesc or translate('cbi_gorel')%>" class="cbi-title-ref" href="<%=k.titleref%>"><%- end -%>
+				<%- if k.titleref then -%><a title="<%=self.titledesc or translate(' ')%>" class="cbi-title-ref" href="<%=k.titleref%>"><%- end -%>
 					<%-=k.title-%>
 				<%- if k.titleref then -%></a><%- end -%>
 				</th>
@@ -90,9 +90,9 @@ end
 							<%- elseif type(self.extedit) == "function" then -%>
 								<%=self:extedit(section)%>
 							<%- end -%>
-							" title="<%:edit%>"><img style="border: none" src="<%=resource%>/cbi/edit.gif" alt="<%:edit%>" /></a>
+							" title="<%:Edit%>"><img style="border: none" src="<%=resource%>/cbi/edit.gif" alt="<%:Edit%>" /></a>
 						<%- end; if self.addremove then %>
-							<input type="image" value="<%:cbi_del%>" name="cbi.rts.<%=self.config%>.<%=k%>" alt="<%:cbi_del%>" title="<%:cbi_del%>" src="<%=resource%>/cbi/remove.gif" />
+							<input type="image" value="<%:Delete%>" name="cbi.rts.<%=self.config%>.<%=k%>" alt="<%:Delete%>" title="<%:Delete%>" src="<%=resource%>/cbi/remove.gif" />
 						<%- end -%>
 					</td>
 				<%- end -%>
@@ -101,7 +101,7 @@ end
 
 			<%- if isempty then -%>
 			<tr class="cbi-section-table-row">
-				<td colspan="<%=count%>"><em><br /><%:cbi_sectempty%></em></td>
+				<td colspan="<%=count%>"><em><br /><%:This section contains no values yet%></em></td>
 			</tr>
 			<%- end -%>
 		</table>
@@ -118,13 +118,13 @@ end
 			<% if self.template_addremove then include(self.template_addremove) else -%>
 			<div class="cbi-section-create cbi-tblsection-create">
 				<% if self.anonymous then %>
-					<input class="cbi-button cbi-button-add" type="submit" value="<%:cbi_add%>" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" title="<%:cbi_add%>" />
+					<input class="cbi-button cbi-button-add" type="submit" value="<%:Add%>" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" title="<%:Add%>" />
 				<% else %>
 					<% if self.invalid_cts then -%><div class="cbi-section-error"><% end %>
 					<input type="text" class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" />
-					<input class="cbi-button cbi-button-add" type="submit" value="<%:cbi_add%>" title="<%:cbi_add%>" />
+					<input class="cbi-button cbi-button-add" type="submit" value="<%:Add%>" title="<%:Add%>" />
 					<% if self.invalid_cts then -%>
-						<br /><%:cbi_invalid%></div>
+						<br /><%:Invalid%></div>
 					<%- end %>
 				<% end %>
 			</div>
diff --git a/libs/cbi/luasrc/view/cbi/tsection.htm b/libs/cbi/luasrc/view/cbi/tsection.htm
index 7fdd7f4ff..0fa285c16 100644
--- a/libs/cbi/luasrc/view/cbi/tsection.htm
+++ b/libs/cbi/luasrc/view/cbi/tsection.htm
@@ -21,7 +21,7 @@ $Id$
 	<% local isempty = true for i, k in ipairs(self:cfgsections()) do -%>
 		<% if self.addremove then -%>
 			<div class="cbi-section-remove right">
-				<input type="submit" name="cbi.rts.<%=self.config%>.<%=k%>" value="<%:cbi_del%>" />
+				<input type="submit" name="cbi.rts.<%=self.config%>.<%=k%>" value="<%:Delete%>" />
 			</div>
 		<%- end %>
 
@@ -40,20 +40,20 @@ $Id$
 	<%- end %>
 
 	<% if isempty then -%>
-		<em><%:cbi_sectempty%><br /><br /></em>
+		<em><%:This section contains no values yet%><br /><br /></em>
 	<%- end %>
 
 	<% if self.addremove then -%>
 		<% if self.template_addremove then include(self.template_addremove) else -%>
 		<div class="cbi-section-create">
 			<% if self.anonymous then -%>
-				<input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" value="<%:cbi_add%>" />
+				<input type="submit" class="cbi-button cbi-button-add" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" value="<%:Add%>" />
 			<%- else -%>
 				<% if self.invalid_cts then -%><div class="cbi-section-error"><% end %>
 				<input type="text" class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" />
-				<input type="submit" class="cbi-button cbi-button-add" value="<%:cbi_add%>" />
+				<input type="submit" class="cbi-button cbi-button-add" value="<%:Add%>" />
 				<% if self.invalid_cts then -%>
-					<br /><%:cbi_invalid%></div>
+					<br /><%:Invalid%></div>
 				<%- end %>
 			<%- end %>
 		</div>
diff --git a/libs/cbi/luasrc/view/cbi/ucisection.htm b/libs/cbi/luasrc/view/cbi/ucisection.htm
index a8b313d36..aef770e17 100644
--- a/libs/cbi/luasrc/view/cbi/ucisection.htm
+++ b/libs/cbi/luasrc/view/cbi/ucisection.htm
@@ -55,7 +55,7 @@ $Id$
 			<% end %>
 		<% else %>
 		<select id="cbi.opt.<%=self.config%>.<%=section%>" name="cbi.opt.<%=self.config%>.<%=section%>">
-			<option><%:cbi_addopt%></option>
+			<option><%:-- Additional Field --%></option>
 			<% for key, val in pairs(self.optionals[section]) do -%>
 				<option id="cbi-<%=self.config.."-"..section.."-"..val.option%>" value="<%=val.option%>"><%=striptags(val.title)%></option>
 			<%- end %>
@@ -75,6 +75,6 @@ $Id$
 		<%- end %><% end %>
 		<% end %></script>
 	<% end %>
-		<input type="submit" class="cbi-button cbi-button-fieldadd" value="<%:add%>" />
+		<input type="submit" class="cbi-button cbi-button-fieldadd" value="<%:Add%>" />
 	</div>
 <% end %>
diff --git a/libs/cbi/luasrc/view/cbi/upload.htm b/libs/cbi/luasrc/view/cbi/upload.htm
index 355f37357..dc7b16fee 100644
--- a/libs/cbi/luasrc/view/cbi/upload.htm
+++ b/libs/cbi/luasrc/view/cbi/upload.htm
@@ -22,7 +22,7 @@ $Id$
 	<% if s then %>
 		<%:cbi_upload Uploaded File%> (<%=t.byte_format(s.size)%>)
 		<input type="hidden"<%= attr("value", v) .. attr("name", cbid) .. attr("id", cbid) %> />
-		<input class="cbi-input-image" type="image" value="<%:cbi_replace%>" name="cbi.rlf.<%=section .. "." .. self.option%>" alt="<%:cbi_replace%>" title="<%:cbi_replace%>" src="<%=resource%>/cbi/reload.gif" />
+		<input class="cbi-input-image" type="image" value="<%:Replace entry%>" name="cbi.rlf.<%=section .. "." .. self.option%>" alt="<%:Replace entry%>" title="<%:Replace entry%>" src="<%=resource%>/cbi/reload.gif" />
 	<% else %>
 		<input class="cbi-input-file" type="file"<%= attr("name", cbid) .. attr("id", cbid) %> />
 	<% end %>
diff --git a/libs/core/luasrc/model/network.lua b/libs/core/luasrc/model/network.lua
index e1e9f4558..8459463f1 100644
--- a/libs/core/luasrc/model/network.lua
+++ b/libs/core/luasrc/model/network.lua
@@ -396,13 +396,13 @@ end
 function interface.get_type_i18n(self)
 	local x = self:type()
 	if x == "wifi" then
-		return i18n.translate("a_s_if_wifidev", "Wireless Adapter")
+		return i18n.translate("Wireless Adapter")
 	elseif x == "bridge" then
-		return i18n.translate("a_s_if_bridge", "Bridge")
+		return i18n.translate("Bridge")
 	elseif x == "switch" then
-		return i18n.translate("a_s_if_ethswitch", "Ethernet Switch")
+		return i18n.translate("Ethernet Switch")
 	else
-		return i18n.translate("a_s_if_ethdev", "Ethernet Adapter")
+		return i18n.translate("Ethernet Adapter")
 	end
 end
 
diff --git a/libs/core/luasrc/model/network/wireless.lua b/libs/core/luasrc/model/network/wireless.lua
index 109367fd4..122532523 100644
--- a/libs/core/luasrc/model/network/wireless.lua
+++ b/libs/core/luasrc/model/network/wireless.lua
@@ -77,12 +77,12 @@ end
 function get_i18n(self, iface)
 	if iface.dev and iface.dev.wifi then
 		return "%s: %s %q" %{
-			i18n.translate("a_s_if_wifinet", "Wireless Network"),
+			i18n.translate("Wireless Network"),
 			i18n.translate("a_s_if_iwmode_" .. (iface.dev.wifi.mode or "ap"), iface.dev.wifi.mode or "AP"),
 			iface.dev.wifi.ssid or iface.dev.wifi.bssid or "(hidden)"
 		}
 	else
-		return "%s: %q" %{ i18n.translate("a_s_if_wifinet", "Wireless Network"), iface:name() }
+		return "%s: %q" %{ i18n.translate("Wireless Network"), iface:name() }
 	end
 end
 
diff --git a/libs/core/luasrc/model/wireless.lua b/libs/core/luasrc/model/wireless.lua
index ea6706076..2a463dbad 100644
--- a/libs/core/luasrc/model/wireless.lua
+++ b/libs/core/luasrc/model/wireless.lua
@@ -100,12 +100,12 @@ end
 function get_i18n(self, iface)
 	if iface.wdev and iface.winfo then
 		return "%s: %s %q (%s)" %{
-			i18n.translate("a_s_if_wifinet", "Wireless Network"),
+			i18n.translate("Wireless Network"),
 			i18n.translate("a_s_if_iwmode_" .. iface:active_mode(), iface.winfo.mode(iface.wdev)),
 			iface:active_ssid() or "(hidden)", iface.wdev
 		}
 	else
-		return "%s: %q" %{ i18n.translate("a_s_if_wifinet", "Wireless Network"), iface:name() }
+		return "%s: %q" %{ i18n.translate("Wireless Network"), iface:name() }
 	end
 end