Merge branch 'master' of github.com:diaspora/diaspora

This commit is contained in:
zhitomirskiyi 2010-10-27 10:32:25 -07:00
commit ebce967550
2 changed files with 8 additions and 0 deletions

View file

@ -15,6 +15,10 @@ en:
taken: "is already taken"
email:
taken: "is already taken"
person:
attributes:
diaspora_handle:
taken: "is already taken"
hello: "Hello world"
application:
helper:

View file

@ -15,6 +15,10 @@ fr:
taken: "est déjà pris"
email:
taken: "est déjà pris"
person:
attributes:
diaspora_handle:
taken: "est déjà pris"
hello: "Bonjour tout le monde"
application:
helper: