Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 14 Jun 2013 10:12:19 +0000 (12:12 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 14 Jun 2013 10:12:19 +0000 (12:12 +0200)
1  2 
tine20/Timetracker/js/Models.js
tine20/Timetracker/js/TimeaccountGridPanel.js
tine20/Timetracker/translations/de.po
tine20/Timetracker/translations/template.pot

Simple merge
Simple merge
@@@ -440,3 -440,6 +440,6 @@@ msgid "timeaccount list
  msgid_plural "timeaccount lists"
  msgstr[0] ""
  msgstr[1] ""
 -msgstr ""
+ msgid "Cleared at"
++msgstr ""