nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/locales/diaspora/en.yml
View file

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

4
config/locales/diaspora/fr.yml
View file

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