fixed git merge confict

This commit is contained in:
Iván Eixarch 2012-12-03 01:39:59 +01:00
commit 657322db91
34 changed files with 1193 additions and 254 deletions

View file

@ -76,3 +76,18 @@ timeslider.toolbar.returnbutton = Return to pad
timeslider.toolbar.authors = Authors:
timeslider.toolbar.authorsList = No Authors
timeslider.exportCurrent = Export current version as:
timeslider.version = Version {{version}}
timeslider.saved = Saved {{month}} {{day}}, {{year}}
timeslider.dateformat = {{month}}/{{day}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}
timeslider.month.january = January
timeslider.month.february = February
timeslider.month.march = March
timeslider.month.april = April
timeslider.month.may = May
timeslider.month.june = June
timeslider.month.july = July
timeslider.month.august = August
timeslider.month.september = September
timeslider.month.october = October
timeslider.month.november = November
timeslider.month.december = December