* Prepare german translation cleanup

9 files changed, 22 insertions, 17 deletions

diff --git a/libs/cbi/luasrc/view/cbi/footer.htm b/libs/cbi/luasrc/view/cbi/footer.htm
index 2acf710cdd..b95ee60b75 100644
--- a/libs/cbi/luasrc/view/cbi/footer.htm
+++ b/libs/cbi/luasrc/view/cbi/footer.htm
@@ -1,6 +1,6 @@
 			<div>
-				<input type="submit" value="<%:save Speichern%>" />
-				<input type="reset" value="<%:reset Zurücksetzen%>" />
+				<input type="submit" value="<%:save%>" />
+				<input type="reset" value="<%:reset%>" />
 				<script type="text/javascript">cbi_d_init();</script>
 			</div>
 		</form>
diff --git a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
index 6151a3a66a..9dc5831691 100644
--- a/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
+++ b/libs/cbi/luasrc/view/cbi/full_valuefooter.htm
@@ -1,6 +1,6 @@
 								<div class="cbi-value-description"><%=self.description%>&nbsp;</div>
 							</div>
-							<% if self.tag_invalid[section] then %><div class="cbi-error"><%:cbi_invalid Fehler: Ungültige Eingabe%></div><% end %>
+							<% if self.tag_invalid[section] then %><div class="cbi-error"><%:cbi_invalid%></div><% end %>
 						</div>
 						<% if #self.deps > 0 then %><script type="text/javascript">
 							<% for j, d in ipairs(self.deps) do %>cbi_d_add("cbi-<%=self.config.."-"..section.."-"..self.option%>", "cbid.<%=self.config.."."..section.."."..d.field%>", "<%=d.value%>");
diff --git a/libs/cbi/luasrc/view/cbi/header.htm b/libs/cbi/luasrc/view/cbi/header.htm
index 4229aaf0df..0af52b49e1 100644
--- a/libs/cbi/luasrc/view/cbi/header.htm
+++ b/libs/cbi/luasrc/view/cbi/header.htm
@@ -3,5 +3,5 @@
 			<div>
 				<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
 				<input type="hidden" name="cbi.submit" value="1" />
-				<input type="submit" value="<%:save Speichern%>" class="hidden" />
+				<input type="submit" value="<%:save%>" class="hidden" />
 			</div>
diff --git a/libs/cbi/luasrc/view/cbi/nsection.htm b/libs/cbi/luasrc/view/cbi/nsection.htm
index fff597ad06..67dad63789 100644
--- a/libs/cbi/luasrc/view/cbi/nsection.htm
+++ b/libs/cbi/luasrc/view/cbi/nsection.htm
@@ -4,7 +4,7 @@ section = self.section %>
 					<h2><%=self.title%></h2>
 					<div class="cbi-section-descr"><%=self.description%></div>
 					<% if self.addremove then %><div class="cbi-section-remove right">
-						<input type="submit" name="cbi.rns.<%=self.config%>.<%=section%>" value="<%:cbi_del Eintrag entfernen%>" />
+						<input type="submit" name="cbi.rns.<%=self.config%>.<%=section%>" value="<%:cbi_del%>" />
 					</div><% end %>
 <div class="cbi-section-node" id="cbi-<%=self.config%>-<%=section%>">
 <%+cbi/ucisection%>
@@ -15,6 +15,6 @@ section = self.section %>
 				<div class="cbi-section" id="cbi-<%=self.config%>-<%=self.section%>">
 					<h2><%=self.title%></h2>
 					<div class="cbi-section-descr"><%=self.description%></div>
-					<input type="submit" name="cbi.cns.<%=self.config%>.<%=self.section%>" value="<%:cbi_add Eintrag anlegen%>" />
+					<input type="submit" name="cbi.cns.<%=self.config%>.<%=self.section%>" value="<%:cbi_add%>" />
 				</div>
 <% end %>
diff --git a/libs/cbi/luasrc/view/cbi/tblsection.htm b/libs/cbi/luasrc/view/cbi/tblsection.htm
index df16efbed0..84d2603ef7 100644
--- a/libs/cbi/luasrc/view/cbi/tblsection.htm
+++ b/libs/cbi/luasrc/view/cbi/tblsection.htm
@@ -28,11 +28,11 @@ scope = {valueheader = "cbi/tiny_valueheader", valuefooter = "cbi/tiny_valuefoot
 <% if self.addremove then %>
 					<div class="cbi-section-create">
 						<% if self.anonymous then %>
-							<input type="submit" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" value="<%:cbi_add Eintrag hinzufügen%>" />
+							<input type="submit" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" value="<%:cbi_add%>" />
 						<% else %>
 							<input type="text" class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" />
-							<input type="submit" value="<%:cbi_add Eintrag hinzufügen%>" />
-						<% end %><% if self.err_invalid then %><div class="cbi-error"><%:cbi_invalid Fehler: Ungültige Eingabe%></div><% end %>
+							<input type="submit" value="<%:cbi_add%>" />
+						<% end %><% if self.err_invalid then %><div class="cbi-error"><%:cbi_invalid%></div><% end %>
 					</div>
 					</div>
 <% end %>
diff --git a/libs/cbi/luasrc/view/cbi/tiny_valuefooter.htm b/libs/cbi/luasrc/view/cbi/tiny_valuefooter.htm
index e65ebb6c03..9875ba4d11 100644
--- a/libs/cbi/luasrc/view/cbi/tiny_valuefooter.htm
+++ b/libs/cbi/luasrc/view/cbi/tiny_valuefooter.htm
@@ -1,4 +1,4 @@
-								<% if self.tag_invalid[section] then %><div class="cbi-error"><%:cbi_invalid Fehler: Ungültige Eingabe%></div><% end %>
+								<% if self.tag_invalid[section] then %><div class="cbi-error"><%:cbi_invalid%></div><% end %>
 						</div>
 						<% if #self.deps > 0 then %><script type="text/javascript">
 							<% for j, d in ipairs(self.deps) do %>cbi_d_add("cbi-<%=self.config.."-"..section.."-"..self.option%>", "cbid.<%=self.config.."."..section.."."..d.field%>", "<%=d.value%>");
diff --git a/libs/cbi/luasrc/view/cbi/tsection.htm b/libs/cbi/luasrc/view/cbi/tsection.htm
index 37b18b5d42..eb5247f7f7 100644
--- a/libs/cbi/luasrc/view/cbi/tsection.htm
+++ b/libs/cbi/luasrc/view/cbi/tsection.htm
@@ -3,7 +3,7 @@
 					<div class="cbi-section-descr"><%=self.description%></div>
 <% 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 Eintrag entfernen%>" />
+							<input type="submit" name="cbi.rts.<%=self.config%>.<%=k%>" value="<%:cbi_del%>" />
 						</div><% end %>
 						<% if not self.anonymous then %><h3><%=k%></h3><% end %>
 <% section = k %>
@@ -15,11 +15,11 @@
 <% if self.addremove then %>
 					<div class="cbi-section-create">
 						<% if self.anonymous then %>
-							<input type="submit" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" value="<%:cbi_add Eintrag hinzufügen%>" />
+							<input type="submit" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" value="<%:cbi_add%>" />
 						<% else %>
 							<input type="text" class="cbi-section-create-name" name="cbi.cts.<%=self.config%>.<%=self.sectiontype%>" />
-							<input type="submit" value="<%:cbi_add Eintrag hinzufügen%>" />
-						<% end %><% if self.err_invalid then %><div class="cbi-error"><%:cbi_invalid Fehler: Ungültige Eingabe%></div><% end %>
+							<input type="submit" value="<%:cbi_add%>" />
+						<% end %><% if self.err_invalid then %><div class="cbi-error"><%:cbi_invalid%></div><% end %>
 					</div>
 <% end %>
 				</div>
diff --git a/libs/cbi/luasrc/view/cbi/ucisection.htm b/libs/cbi/luasrc/view/cbi/ucisection.htm
index 0abc37e7c6..ddf3f44f21 100644
--- a/libs/cbi/luasrc/view/cbi/ucisection.htm
+++ b/libs/cbi/luasrc/view/cbi/ucisection.htm
@@ -5,7 +5,7 @@
 								<input type="text" name="cbi.opt.<%=self.config%>.<%=section%>" />
 							<% else %>
 								<select name="cbi.opt.<%=self.config%>.<%=section%>">
-									<option><%:cbi_addopt -- Feld --%></option>
+									<option><%:cbi_addopt%></option>
 								<% for key, val in pairs(self.optionals[section]) do %>
 									<option id="cbi-<%=self.config.."-"..section.."-"..val.option%>" value="<%=val.option%>"><%=val.title%></option>
 								<% end %>
@@ -15,6 +15,6 @@
 								<% end %><% end %>
 								<% end %></script>
 							<% end %>
-								<input type="submit" value="<%:add hinzufügen%>" />
+								<input type="submit" value="<%:add%>" />
 							</div>
 						<% end %>
\ No newline at end of file
diff --git a/libs/web/luasrc/template.lua b/libs/web/luasrc/template.lua
index cc534ab458..61e4e39ec9 100644
--- a/libs/web/luasrc/template.lua
+++ b/libs/web/luasrc/template.lua
@@ -83,6 +83,7 @@ function compile(template)
 	-- Replacements
 	local r_include = "')\ninclude('%s')\nwrite('"
 	local r_i18n    = "'..translate('%1','%2')..'"
+	local r_i18n2    = "'..translate('%1', '')..'"
 	local r_pexec   = "'..(%s or '')..'"
 	local r_exec    = "')\n%s\nwrite('"
 	
@@ -93,7 +94,11 @@ function compile(template)
 		if p == "+" then
 			re = r_include:format(sanitize(string.sub(v, 2)))
 		elseif p == ":" then
-			re = sanitize(v):gsub(":(.-) (.+)", r_i18n)
+			if v:find(" ") then
+				re = sanitize(v):gsub(":(.-) (.*)", r_i18n)
+			else
+				re = sanitize(v):gsub(":(.+)", r_i18n2)
+			end
 		elseif p == "=" then
 			re = r_pexec:format(v:sub(2))
 		else