Tyler Renelle 1706c29df7 Merge remote-tracking branch 'blixhavn/master' into translations ...

Conflicts:
	locales/no/app.json

2013-11-13 15:10:03 -08:00

..

bg

translations: temporarily swap locales_old/locales so we can merge all

2013-11-13 14:54:17 -08:00

cs

translations: temporarily swap locales_old/locales so we can merge all

2013-11-13 14:54:17 -08:00

cu

translations: temporarily swap locales_old/locales so we can merge all

2013-11-13 14:54:17 -08:00

de

translations: temporarily swap locales_old/locales so we can merge all

2013-11-13 14:54:17 -08:00

en

translations: temporarily swap locales_old/locales so we can merge all

2013-11-13 14:54:17 -08:00

es

translations: temporarily swap locales_old/locales so we can merge all

2013-11-13 14:54:17 -08:00

fr

translations: temporarily swap locales_old/locales so we can merge all

2013-11-13 14:54:17 -08:00

he

translations: temporarily swap locales_old/locales so we can merge all

2013-11-13 14:54:17 -08:00

id

translations: temporarily swap locales_old/locales so we can merge all

2013-11-13 14:54:17 -08:00

it

translations: temporarily swap locales_old/locales so we can merge all

2013-11-13 14:54:17 -08:00

ja

translations: temporarily swap locales_old/locales so we can merge all

2013-11-13 14:54:17 -08:00

nl

translations: temporarily swap locales_old/locales so we can merge all

2013-11-13 14:54:17 -08:00

no

translations: temporarily swap locales_old/locales so we can merge all

2013-11-13 14:54:17 -08:00

pl

translations: temporarily swap locales_old/locales so we can merge all

2013-11-13 14:54:17 -08:00

pt

translations: temporarily swap locales_old/locales so we can merge all

2013-11-13 14:54:17 -08:00

ru

translations: temporarily swap locales_old/locales so we can merge all

2013-11-13 14:54:17 -08:00

uk

translations: temporarily swap locales_old/locales so we can merge all

2013-11-13 14:54:17 -08:00

ur

translations: temporarily swap locales_old/locales so we can merge all

2013-11-13 14:54:17 -08:00