diff options
| author | spag <spag@golwen.net> | 2013-01-29 09:32:57 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2013-01-29 09:32:57 +0100 |
| commit | 24f613cac47fae29a48dab351e9ee195f5b53eed (patch) | |
| tree | 6a5c05313b58c29fd2799c65d26872d782d69921 /config | |
| parent | 53a98b21f031b429f14a9cd9ec2feeb040a633db (diff) | |
| parent | 5f603012881517483df0c9e4473d0aacdde66655 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/de.yml | 5 | ||||
| -rw-r--r-- | config/locales/en.yml | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/config/locales/de.yml b/config/locales/de.yml index e82f513..9d85d8e 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -194,4 +194,7 @@ de: long: ! '%A, %d. %B %Y, %H:%M Uhr' short: ! '%d. %B, %H:%M Uhr' pm: nachmittags - date_only: '%d.%m.%Y'
\ No newline at end of file + date_only: '%d.%m.%Y' + misc: + send_a_bugreport: 'Fehler melden (Bugreport).' + consulting: 'Consulting' diff --git a/config/locales/en.yml b/config/locales/en.yml index dab4595..0ad4b1c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -4,3 +4,6 @@ en: date_only: '%m/%d/%Y' short: ! '%m/%d/%y %H:%M' date_only: '%m/%d/%Y' + misc: + send_a_bugreport: 'Send a bugreport.' + consulting: 'Consulting'
\ No newline at end of file |