Maikel Linke a94961c0a7 Fixup merge conflicts and remove unused text

2017-03-29 14:58:19 +11:00

..

en_GB.yml

Updating translations for config/locales/en_GB.yml [skip ci]

2016-11-30 01:07:53 +11:00

en-GB.yml

Enterprise Terms of Service

2017-02-22 13:40:17 +11:00

en-US.yml

Finishing Translations keys implemtentation on Admin ERB views

2017-02-19 22:08:34 +01:00

en.yml

Fixup merge conflicts and remove unused text

2017-03-29 14:58:19 +11:00

es.yml

Updating translations for es.yml, fr.yml and nb.yml

2015-12-24 11:44:12 +11:00

fr.yml

Merge remote-tracking branch 'origin/master' into transifex

2017-03-16 09:30:22 +11:00

it.yml

Finishing Translations keys implemtentation on Admin ERB views

2017-02-19 22:08:34 +01:00

nb.yml

Finishing Translations keys implemtentation on Admin ERB views

2017-02-19 22:08:34 +01:00

pt-BR.yml

Finishing Translations keys implemtentation on Admin ERB views

2017-02-19 22:08:34 +01:00

simple_form.en.yml

Add default simple_form configuration, locales, scaffold

2012-06-19 10:29:26 +10:00

sv.yml

Finishing Translations keys implemtentation on Admin ERB views

2017-02-19 22:08:34 +01:00