diaspora/config/locales
danielgrippi ab76b0cd8e Bring the likes back. Ditch the pins.
Revert "swap pin for heart [ci skip]"

This reverts commit 488e064e11.

Conflicts:

	app/views/templates/likes_info.jst

Revert "reference pin icon in mobile view [ci skip]"

This reverts commit 9377dd30f4.

Revert "first pass at strickly user level rename from like => pin. still need to update assets"

This reverts commit d06ccb9ba9.

Conflicts:

	config/locales/diaspora/en.yml

add heart icon back
2012-02-13 19:13:43 -08:00
..
cldr do proper pluralization for JS 2012-01-14 20:27:17 +01:00
devise updated 97 locale files [ci skip] 2012-02-13 13:04:23 +01:00
diaspora Bring the likes back. Ditch the pins. 2012-02-13 19:13:43 -08:00
inflections added readme for inflection definitions 2011-04-18 22:37:24 +02:00
javascript Bring the likes back. Ditch the pins. 2012-02-13 19:13:43 -08:00
README.md added readme to locales directory [ci skip] 2011-12-08 20:10:07 +01:00

Please read the translation guide before contributing!