Maikel Linke b66cf14bcb Merge remote-tracking branch 'origin/master' into transifex ...

Conflicts:
	config/locales/en_GB.yml

2016-10-28 15:21:03 +11:00

..

en-GB.yml

Updates to UK translations

2016-09-19 20:33:58 +01:00

en-US.yml

Some US-Specific copy. (#1018)

2016-06-01 12:13:03 +10:00

en.yml

Add confirm when delete customer

2016-10-21 10:51:36 +11:00

es.yml

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

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

fr.yml

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

2016-10-12 01:03:42 +11:00

it.yml

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

2016-10-21 22:51:27 +11:00

nb.yml

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

2016-10-02 00:38:02 +10:00

simple_form.en.yml

Add default simple_form configuration, locales, scaffold

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