Merge remote branch 'upstream/master'

This commit is contained in:
Jakob Hirsch 2011-03-22 13:01:22 +01:00
commit d87218c571

View file

@ -98,7 +98,7 @@
"required" : ["title", "resolution"],
"optional" : ["description", "details:", "owner:", "address:", "tolerance", "public", "cost"],
"icon" : "flame.png",
"unit" : "m³",
"unit" : "m³/h",
"interpreter" : "Volkszaehler\\Interpreter\\MeterInterpreter",
"model" : "Volkszaehler\\Model\\Channel",
"translation" : {
@ -112,7 +112,7 @@
"required" : ["title", "resolution"],
"optional" : ["description", "details:", "owner:", "address:", "tolerance", "public", "cost"],
"icon" : "waterdrop.png",
"unit" : "",
"unit" : "l/h",
"interpreter" : "Volkszaehler\\Interpreter\\MeterInterpreter",
"model" : "Volkszaehler\\Model\\Channel",
"translation" : {