Commit Graph

138 Commits

Author SHA1 Message Date
wvengen 3588962329 remove unused layout 2013-10-30 20:53:01 +01:00
wvengen 5ead67f88c remove unused memberships controller/view 2013-10-30 20:46:59 +01:00
wvengen 13a7f84e35 localeapp roundtrip [ci skip] 2013-10-23 12:48:19 +02:00
wvengen d1f9b0b090 apply changes to other translations + translation fixes 2013-10-21 17:55:58 +02:00
wvengen 98e7189d31 Merge branch 'master' into i18n
Conflicts:
	app/assets/javascripts/application.js
2013-10-18 12:30:34 +02:00
wvengen 6e5184d796 use rails-i18n translations 2013-10-17 16:43:14 +02:00
wvengen 092bc6b150 translation updates 2013-10-17 15:32:03 +02:00
wvengen 34a4951e28 Merge branch 'master' into i18n
Conflicts:
	Gemfile
	config/locales/de.yml
	config/locales/en.yml
2013-10-09 23:57:43 +02:00
wvengen 762292ef8e small i18n move 2013-10-09 22:29:19 +02:00
wvengen 1b49a08c5e localeapp roundtrip 2013-10-08 11:42:23 +02:00
Julius ac1341d5b0 Merge branch 'master' of http://github.com/foodcoops/foodsoft into article-price-tooltip 2013-10-03 23:22:31 +02:00
Julius fef8c6d99f Move StockArticle#history to StockArticle#show 2013-10-03 22:24:21 +02:00
wvengen 1674dcf851 fix i18n of article sync 2013-10-03 14:36:53 +02:00
wvengen 3574f239c6 localeapp roundtrip 2013-10-02 17:33:37 +02:00
wvengen 1d8fefcfb7 small i18n update 2013-10-02 17:08:24 +02:00
wvengen 0bb62332c0 localeapp roundtrip 2013-10-01 00:05:46 +02:00
wvengen f1f7e8d709 localeapp roundtrip 2013-09-18 19:14:48 +02:00
Benjamin Meichsner 5444c3a1c0 Merged updates from localeapp. 2013-09-18 17:48:24 +02:00
wvengen ee31c0c2af localeapp roundtrip 2013-09-10 12:06:40 +02:00
wvengen 6418790ef5 localeapp roundtrip, with updated translations 2013-09-10 10:46:02 +02:00
wvengen 9922c0322a first version of new translation: French 2013-09-06 19:41:24 +02:00
Benjamin Meichsner 51a91f376d Updated locales from localeapp. 2013-09-02 13:34:30 +02:00
wvengen 3e4c535bb1 update translations and localeapp roundtrip 2013-07-18 19:27:52 +02:00
wvengen 1d12e09342 update translations and localeapp roundtrip 2013-07-18 16:22:38 +02:00
wvengen 3fd498d29f translations update 2013-07-13 12:37:20 +02:00
wvengen 66e0bbc348 cleanup translation changes introduced by last merge 2013-07-11 22:09:58 +02:00
wvengen 2ee1bef410 translation updates 2013-07-11 21:36:32 +02:00
wvengen 9ef208fa13 small translation changes 2013-06-29 03:02:05 +02:00
wvengen b807e9d059 beautify order mail 2013-06-29 02:54:00 +02:00
wvengen 9b0db5bb0b translation updates: capitalisations, order_result mail 2013-06-29 02:46:20 +02:00
wvengen e450cf404e harmonize order cycle translations 2013-06-25 00:16:30 +02:00
wvengen cab6ada8b8 small invoice i18n cleanup/refactoring 2013-06-21 14:24:05 +02:00
wvengen c5c4b1f93f small translation updates 2013-06-21 13:54:36 +02:00
wvengen 906093b3ce small i18n fixes and clarifications 2013-06-21 13:49:34 +02:00
wvengen 3cfd8b2d44 fix i18n key 2013-06-21 13:25:52 +02:00
wvengen 713c030213 i18n and translate missing entry 2013-06-15 18:43:42 +02:00
wvengen 8c08de9eae translation fixes, clarifications and additions 2013-06-15 17:59:15 +02:00
wvengen e3e1b5a1b3 add start of Dutch translation 2013-06-13 00:08:15 +02:00