Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/fritzek/fat_free_crm into f…
Browse files Browse the repository at this point in the history
…ritzek/master
  • Loading branch information
Mike Dvorkin committed Mar 20, 2010
2 parents 94adc8a + d59b4af commit c6e0dac
Show file tree
Hide file tree
Showing 3 changed files with 693 additions and 253 deletions.
10 changes: 5 additions & 5 deletions config/locales/de.yml
Expand Up @@ -22,8 +22,8 @@ de:
long: "%A, %d. %B %Y, %H:%M Uhr"
time: "%H:%M"

am: "vormittags"
pm: "nachmittags"
am: " vormittags"
pm: " nachmittags"

datetime:
distance_in_words:
Expand All @@ -47,16 +47,16 @@ de:
other: 'etwa {{count}} Stunden'
x_days:
one: '1 Tag'
other: '{{count}} Tage'
other: '{{count}} Tagen'
about_x_months:
one: 'etwa 1 Monat'
other: 'etwa {{count}} Monate'
x_months:
one: '1 Monat'
other: '{{count}} Monate'
other: '{{count}} Monaten'
about_x_years:
one: 'etwa 1 Jahr'
other: 'etwa {{count}} Jahre'
other: 'etwa {{count}} Jahren'
over_x_years:
one: 'mehr als 1 Jahr'
other: 'mehr als {{count}} Jahre'
Expand Down

0 comments on commit c6e0dac

Please sign in to comment.